diff options
| author | Torne (Richard Coles) <torne@google.com> | 2017-10-04 11:29:58 -0400 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2017-10-04 12:40:55 -0400 |
| commit | 29675b294126bd00bb51bc8616f476aa90abacf1 (patch) | |
| tree | e33569aa9a2a56d7e2c58397e7105fc9ff053d47 /core/java/android/webkit/WebViewLibraryLoader.java | |
| parent | cc78a9b63667ed62ea67070ad9abbf34a62b8317 (diff) | |
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"
Diffstat (limited to 'core/java/android/webkit/WebViewLibraryLoader.java')
| -rw-r--r-- | core/java/android/webkit/WebViewLibraryLoader.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/webkit/WebViewLibraryLoader.java b/core/java/android/webkit/WebViewLibraryLoader.java index 6f9e8ece4b13..21316e7db9e4 100644 --- a/core/java/android/webkit/WebViewLibraryLoader.java +++ b/core/java/android/webkit/WebViewLibraryLoader.java @@ -80,7 +80,7 @@ class WebViewLibraryLoader { } 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); } |
