Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix NPE in WebView relro creator process."

Browse Source
This commit is contained in:
TreeHugger Robot
2017-10-04 18:45:41 +00:00
committed by Android (Google) Code Review
parent d20b3252c6 29675b2941
commit 4a80ff845a
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/webkit/WebViewFactory.java
View File

@@ -492,10 +492,15 @@ public final class WebViewFactory {
/** @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));
}
}

2
core/java/android/webkit/WebViewLibraryLoader.java
View File

@@ -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);
}