Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4a80ff84 authored Oct 04, 2017 by TreeHugger Robot Committed by Android (Google) Code Review Oct 04, 2017

Merge "Fix NPE in WebView relro creator process."

parents d20b3252 29675b29

core/java/android/webkit/WebViewFactory.java

+7 −2

Original line number	Diff line number	Diff line
		@@ -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));
		}
		}

core/java/android/webkit/WebViewLibraryLoader.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);
		}