Commit e9a864d1 authored Apr 02, 2024 by Richard Coles

webview: handle null in pinning impl.

The code to pin WebView wasn't handling sharedLibraryFiles being null;
the Google-branded WebView always has at least one shared library
dependency, but the AOSP build isn't guaranteed to and was causing an
exception to be thrown here in some configurations, skipping both the
pinning and also later parts of WebView initialization.

Bug: 307594624
Bug: 331842293
Test: boot using older AOSP WebView, check logcat and dumpsys pinner
Change-Id: I6b078e603d7cdcad6b443093789295d85835c574

parent b8f7f8d3

services/core/java/com/android/server/webkit/SystemImpl.java

+4 −2

Original line number	Diff line number	Diff line
		@@ -310,9 +310,11 @@ public class SystemImpl implements SystemInterface {

		ArrayList<String> apksToPin = new ArrayList<>();
		boolean pinSharedFirst = appInfo.metaData.getBoolean("PIN_SHARED_LIBS_FIRST", true);
		if (appInfo.sharedLibraryFiles != null) {
		for (String sharedLib : appInfo.sharedLibraryFiles) {
		apksToPin.add(sharedLib);
		}
		}
		apksToPin.add(appInfo.sourceDir);
		if (!pinSharedFirst) {
		// We want to prioritize pinning of the native library that is most likely used by apps