commit 29675b294126bd00bb51bc8616f476aa90abacf1
author Torne (Richard Coles) <torne@google.com> Wed Oct 04 11:29:58 2017 -0400
committer Torne (Richard Coles) <torne@google.com> Wed Oct 04 12:40:55 2017 -0400
tree e33569aa9a2a56d7e2c58397e7105fc9ff053d47
parent cc78a9b63667ed62ea67070ad9abbf34a62b8317

Fix NPE in WebView relro creator process.

There's no context available in the relro creator process, resulting in
a NPE and crash when it tries to see if WebView is supported. Skip the
check in this case, because we know it's supported if we ran the relro
creation process at all.

Change-Id: I95e9aad7407b8f73dddf8a8b685d41d2f500736a
Fixes: 67398770
Test: boot, make sure no crash dialog from "android"

core/java/android/webkit/WebViewFactory.java

diff --git a/core/java/android/webkit/WebViewFactory.java b/core/java/android/webkit/WebViewFactory.java
index 36b24ff..4773cda 100644
--- a/core/java/android/webkit/WebViewFactory.java
+++ b/core/java/android/webkit/WebViewFactory.java
@@ -492,10 +492,15 @@
     /** @hide */
     public static IWebViewUpdateService getUpdateService() {
         if (isWebViewSupported()) {
-            return IWebViewUpdateService.Stub.asInterface(
-                    ServiceManager.getService(WEBVIEW_UPDATE_SERVICE_NAME));
+            return getUpdateServiceUnchecked();
         } else {
             return null;
         }
     }
+
+    /** @hide */
+    static IWebViewUpdateService getUpdateServiceUnchecked() {
+        return IWebViewUpdateService.Stub.asInterface(
+                ServiceManager.getService(WEBVIEW_UPDATE_SERVICE_NAME));
+    }
 }

core/java/android/webkit/WebViewLibraryLoader.java

diff --git a/core/java/android/webkit/WebViewLibraryLoader.java b/core/java/android/webkit/WebViewLibraryLoader.java
index 6f9e8ec..21316e7 100644
--- a/core/java/android/webkit/WebViewLibraryLoader.java
+++ b/core/java/android/webkit/WebViewLibraryLoader.java
@@ -80,7 +80,7 @@
             } finally {
                 // We must do our best to always notify the update service, even if something fails.
                 try {
-                    WebViewFactory.getUpdateService().notifyRelroCreationCompleted();
+                    WebViewFactory.getUpdateServiceUnchecked().notifyRelroCreationCompleted();
                 } catch (RemoteException e) {
                     Log.e(LOGTAG, "error notifying update service", e);
                 }