summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorGustav Sennton <gsennton@google.com>2016-03-18 10:52:32 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-03-18 10:52:34 +0000
commiteedcdb045283faa894ef7b00722ae69eb780ceae (patch)
tree9815a31ef198645bc94b0bfeb8af1d8190e63f25 /core/java
parentb898ce9511657ba9e9634f03e1104326b1e520ec (diff)
parent26c82fff095ad551301111fb0cfca3719f8c3d67 (diff)
Merge "Remove WebView-package-being-replaced logic from WebViewUpdateService." into nyc-dev
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/webkit/WebViewFactory.java5
1 files changed, 1 insertions, 4 deletions
diff --git a/core/java/android/webkit/WebViewFactory.java b/core/java/android/webkit/WebViewFactory.java
index 0751ab009c80..c280b81f73a3 100644
--- a/core/java/android/webkit/WebViewFactory.java
+++ b/core/java/android/webkit/WebViewFactory.java
@@ -103,8 +103,7 @@ public final class WebViewFactory {
public static final int LIBLOAD_FAILED_JNI_CALL = 7;
// more error codes for waiting for WebView preparation
- public static final int LIBLOAD_WEBVIEW_BEING_REPLACED = 8;
- public static final int LIBLOAD_FAILED_WAITING_FOR_WEBVIEW_REASON_UNKNOWN = 9;
+ public static final int LIBLOAD_FAILED_WAITING_FOR_WEBVIEW_REASON_UNKNOWN = 8;
// error for namespace lookup
public static final int LIBLOAD_FAILED_TO_FIND_NAMESPACE = 10;
@@ -115,8 +114,6 @@ public final class WebViewFactory {
return "Time out waiting for Relro files being created";
case LIBLOAD_FAILED_LISTING_WEBVIEW_PACKAGES:
return "No WebView installed";
- case LIBLOAD_WEBVIEW_BEING_REPLACED:
- return "Time out waiting for WebView to be replaced";
case LIBLOAD_FAILED_WAITING_FOR_WEBVIEW_REASON_UNKNOWN:
return "Crashed for unknown reason";
}