diff options
| author | Narayan Kamath <narayan@google.com> | 2014-11-27 17:58:21 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-27 17:58:21 +0000 |
| commit | ed2c9c6029b18df9c25d6c98c909ac5f300d6ab1 (patch) | |
| tree | 170b6838a1257d31310df66452872e282a94f3cd /core/java/android/webkit/WebViewDelegate.java | |
| parent | bedb13782a6beb5f15621915a7b68439c6649ced (diff) | |
| parent | 10a36fb749d05bd90fc8ef3114562cacb631c07c (diff) | |
am 10a36fb7: Merge "Stop using ErrorStrings for apache."
* commit '10a36fb749d05bd90fc8ef3114562cacb631c07c':
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 3dcfda333398..a247c4610100 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); } /** |