diff options
| author | Narayan Kamath <narayan@google.com> | 2014-11-27 18:03:15 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-27 18:03:15 +0000 |
| commit | f1459604392dc0416500e149f1bafa11139dcfcc (patch) | |
| tree | 4817602b4953f6c1a82d7d05b32a889104420c39 /core/java/android/webkit/WebViewDelegate.java | |
| parent | d534645bab608bbee1ec6e9e72d10b88c53c023f (diff) | |
| parent | ed2c9c6029b18df9c25d6c98c909ac5f300d6ab1 (diff) | |
am ed2c9c60: am 10a36fb7: Merge "Stop using ErrorStrings for apache."
* commit 'ed2c9c6029b18df9c25d6c98c909ac5f300d6ab1':
Stop using ErrorStrings for apache.
Diffstat (limited to 'core/java/android/webkit/WebViewDelegate.java')
| -rw-r--r-- | core/java/android/webkit/WebViewDelegate.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/core/java/android/webkit/WebViewDelegate.java b/core/java/android/webkit/WebViewDelegate.java index e03445e0175f..ac360fa22851 100644 --- a/core/java/android/webkit/WebViewDelegate.java +++ b/core/java/android/webkit/WebViewDelegate.java @@ -22,7 +22,6 @@ import android.app.Application; import android.content.Context; import android.content.res.Resources; import android.graphics.Canvas; -import android.net.http.ErrorStrings; import android.os.SystemProperties; import android.os.Trace; import android.util.SparseArray; @@ -150,7 +149,7 @@ public final class WebViewDelegate { * Returns the error string for the given {@code errorCode}. */ public String getErrorString(Context context, int errorCode) { - return ErrorStrings.getString(errorCode, context); + return LegacyErrorStrings.getString(errorCode, context); } /** |