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

Merge "Consider shared libs when precreating WebView classloader."

Browse Source 
am: f9fd8dfcc0

Change-Id: I2e326ffb47a95c01bf5e67320bbf8aa8193916af
This commit is contained in:
Torne (Richard Coles)
2018-02-21 00:03:58 +00:00
committed by android-build-merger
parent ffe0e51f47 f9fd8dfcc0
commit 424f3ab432
3 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -463,7 +463,7 @@ public final class WebViewFactory {
*/ */
public static int onWebViewProviderChanged(PackageInfo packageInfo) { public static int onWebViewProviderChanged(PackageInfo packageInfo) {
String[] nativeLibs = null; String[] nativeLibs = null;
String originalSourceDir = packageInfo.applicationInfo.sourceDir; ApplicationInfo originalAppInfo = new ApplicationInfo(packageInfo.applicationInfo);
try { try {
fixupStubApplicationInfo(packageInfo.applicationInfo, fixupStubApplicationInfo(packageInfo.applicationInfo,
AppGlobals.getInitialApplication().getPackageManager()); AppGlobals.getInitialApplication().getPackageManager());
@@ -474,7 +474,7 @@ public final class WebViewFactory {
Log.e(LOGTAG, "error preparing webview native library", t); Log.e(LOGTAG, "error preparing webview native library", t);
} }
WebViewZygote.onWebViewProviderChanged(packageInfo, originalSourceDir); WebViewZygote.onWebViewProviderChanged(packageInfo, originalAppInfo);
return prepareWebViewInSystemServer(nativeLibs); return prepareWebViewInSystemServer(nativeLibs);
} }

19
core/java/android/webkit/WebViewZygote.java
View File

@@ -17,6 +17,7 @@
package android.webkit; package android.webkit;
import android.app.LoadedApk; import android.app.LoadedApk;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageInfo; import android.content.pm.PackageInfo;
import android.os.Build; import android.os.Build;
import android.os.SystemService; import android.os.SystemService;
@@ -68,11 +69,11 @@ public class WebViewZygote {
private static PackageInfo sPackage; private static PackageInfo sPackage;
/** /**
* Cache key for the selected WebView package's classloader. This is set from * Original ApplicationInfo for the selected WebView package before stub fixup. This is set from
* #onWebViewProviderChanged(). * #onWebViewProviderChanged().
*/ */
@GuardedBy("sLock") @GuardedBy("sLock")
private static String sPackageCacheKey; private static ApplicationInfo sPackageOriginalAppInfo;
/** /**
* Flag for whether multi-process WebView is enabled. If this is false, the zygote * Flag for whether multi-process WebView is enabled. If this is false, the zygote
@@ -126,10 +127,11 @@ public class WebViewZygote {
} }
} }
public static void onWebViewProviderChanged(PackageInfo packageInfo, String cacheKey) { public static void onWebViewProviderChanged(PackageInfo packageInfo,
ApplicationInfo originalAppInfo) {
synchronized (sLock) { synchronized (sLock) {
sPackage = packageInfo; sPackage = packageInfo;
sPackageCacheKey = cacheKey; sPackageOriginalAppInfo = originalAppInfo;
// If multi-process is not enabled, then do not start the zygote service. // If multi-process is not enabled, then do not start the zygote service.
if (!sMultiprocessEnabled) { if (!sMultiprocessEnabled) {
@@ -218,10 +220,17 @@ public class WebViewZygote {
final String zip = (zipPaths.size() == 1) ? zipPaths.get(0) : final String zip = (zipPaths.size() == 1) ? zipPaths.get(0) :
TextUtils.join(File.pathSeparator, zipPaths); TextUtils.join(File.pathSeparator, zipPaths);
// In the case where the ApplicationInfo has been modified by the stub WebView,
// we need to use the original ApplicationInfo to determine what the original classpath
// would have been to use as a cache key.
LoadedApk.makePaths(null, false, sPackageOriginalAppInfo, zipPaths, null);
final String cacheKey = (zipPaths.size() == 1) ? zipPaths.get(0) :
TextUtils.join(File.pathSeparator, zipPaths);
ZygoteProcess.waitForConnectionToZygote(WEBVIEW_ZYGOTE_SOCKET); ZygoteProcess.waitForConnectionToZygote(WEBVIEW_ZYGOTE_SOCKET);
Log.d(LOGTAG, "Preloading package " + zip + " " + librarySearchPath); Log.d(LOGTAG, "Preloading package " + zip + " " + librarySearchPath);
sZygote.preloadPackageForAbi(zip, librarySearchPath, sPackageCacheKey, sZygote.preloadPackageForAbi(zip, librarySearchPath, cacheKey,
Build.SUPPORTED_ABIS[0]); Build.SUPPORTED_ABIS[0]);
} catch (Exception e) { } catch (Exception e) {
Log.e(LOGTAG, "Error connecting to " + serviceName, e); Log.e(LOGTAG, "Error connecting to " + serviceName, e);

4
services/core/java/com/android/server/webkit/SystemImpl.java
View File

@@ -304,6 +304,6 @@ public class SystemImpl implements SystemInterface {
// flags declaring we want extra info from the package manager for webview providers // flags declaring we want extra info from the package manager for webview providers
private final static int PACKAGE_FLAGS = PackageManager.GET_META_DATA private final static int PACKAGE_FLAGS = PackageManager.GET_META_DATA
| PackageManager.GET_SIGNATURES | PackageManager.MATCH_DEBUG_TRIAGED_MISSING | PackageManager.GET_SIGNATURES | PackageManager.GET_SHARED_LIBRARY_FILES
| PackageManager.MATCH_ANY_USER; | PackageManager.MATCH_DEBUG_TRIAGED_MISSING | PackageManager.MATCH_ANY_USER;
} }