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

Merge "Explicitly wait for the WebView Zygote." into oc-dev

Browse Source
This commit is contained in:
Gustav Sennton
2017-04-25 16:05:53 +00:00
committed by Android (Google) Code Review
parent 44515357ce 833813cecc
commit 3202c10207
1 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,6 +40,7 @@ public class WebViewZygote {
private static final String WEBVIEW_ZYGOTE_SERVICE_32 = "webview_zygote32";
private static final String WEBVIEW_ZYGOTE_SERVICE_64 = "webview_zygote64";
private static final String WEBVIEW_ZYGOTE_SOCKET = "webview_zygote";
/**
* Lock object that protects all other static members.
@@ -202,7 +203,7 @@ public class WebViewZygote {
}
try {
sZygote = new ZygoteProcess("webview_zygote", null);
sZygote = new ZygoteProcess(WEBVIEW_ZYGOTE_SOCKET, null);
// All the work below is usually done by LoadedApk, but the zygote can't talk to
// PackageManager or construct a LoadedApk since it's single-threaded pre-fork, so
@@ -217,6 +218,8 @@ public class WebViewZygote {
final String zip = (zipPaths.size() == 1) ? zipPaths.get(0) :
TextUtils.join(File.pathSeparator, zipPaths);
waitForZygote();
Log.d(LOGTAG, "Preloading package " + zip + " " + librarySearchPath);
sZygote.preloadPackageForAbi(zip, librarySearchPath, sPackageCacheKey,
Build.SUPPORTED_ABIS[0]);
@@ -225,4 +228,25 @@ public class WebViewZygote {
sZygote = null;
}
}
/**
* Wait until a connection to the Zygote can be established.
*/
private static void waitForZygote() {
while (true) {
try {
final ZygoteProcess.ZygoteState zs =
ZygoteProcess.ZygoteState.connect(WEBVIEW_ZYGOTE_SOCKET);
zs.close();
break;
} catch (IOException ioe) {
Log.w(LOGTAG, "Got error connecting to zygote, retrying. msg= " + ioe.getMessage());
}
try {
Thread.sleep(1000);
} catch (InterruptedException ie) {
}
}
}
}