diff options
| author | Selim Gurun <sgurun@google.com> | 2015-03-30 23:57:09 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-03-30 23:57:10 +0000 |
| commit | 75e4f353835d62c8625fb145e3aba1d442f93a90 (patch) | |
| tree | e2334eaf460ccb84294b1f0fe3f188b50137330a | |
| parent | 8091ac4cfe06ea6d1ef259f17c79ec19f4d3a65b (diff) | |
| parent | fc90c05649a7a19e330c386cba35a4d2c35f8349 (diff) | |
| download | frameworks_base-75e4f353835d62c8625fb145e3aba1d442f93a90.zip frameworks_base-75e4f353835d62c8625fb145e3aba1d442f93a90.tar.gz frameworks_base-75e4f353835d62c8625fb145e3aba1d442f93a90.tar.bz2 | |
Merge "Remove unnecessary code"
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | api/system-current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/webkit/WebViewClient.java | 2 |
3 files changed, 0 insertions, 4 deletions
diff --git a/api/current.txt b/api/current.txt index ef078fd..33ff15a 100644 --- a/api/current.txt +++ b/api/current.txt @@ -37794,7 +37794,6 @@ package android.webkit { method public boolean shouldOverrideUrlLoading(android.webkit.WebView, java.lang.String); field public static final int ERROR_AUTHENTICATION = -4; // 0xfffffffc field public static final int ERROR_BAD_URL = -12; // 0xfffffff4 - field public static final int ERROR_BLOCKED = -16; // 0xfffffff0 field public static final int ERROR_CONNECT = -6; // 0xfffffffa field public static final int ERROR_FAILED_SSL_HANDSHAKE = -11; // 0xfffffff5 field public static final int ERROR_FILE = -13; // 0xfffffff3 diff --git a/api/system-current.txt b/api/system-current.txt index 442076a..b64ec27 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -40439,7 +40439,6 @@ package android.webkit { method public boolean shouldOverrideUrlLoading(android.webkit.WebView, java.lang.String); field public static final int ERROR_AUTHENTICATION = -4; // 0xfffffffc field public static final int ERROR_BAD_URL = -12; // 0xfffffff4 - field public static final int ERROR_BLOCKED = -16; // 0xfffffff0 field public static final int ERROR_CONNECT = -6; // 0xfffffffa field public static final int ERROR_FAILED_SSL_HANDSHAKE = -11; // 0xfffffff5 field public static final int ERROR_FILE = -13; // 0xfffffff3 diff --git a/core/java/android/webkit/WebViewClient.java b/core/java/android/webkit/WebViewClient.java index 53c7e04..8a2b3fa 100644 --- a/core/java/android/webkit/WebViewClient.java +++ b/core/java/android/webkit/WebViewClient.java @@ -200,8 +200,6 @@ public class WebViewClient { public static final int ERROR_FILE_NOT_FOUND = -14; /** Too many requests during this load */ public static final int ERROR_TOO_MANY_REQUESTS = -15; - /** Request blocked by the browser */ - public static final int ERROR_BLOCKED = -16; /** * Report an error to the host application. These errors are unrecoverable |