drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Workaround 64 bit devices that don't have zygotes yet."

Browse Source
This commit is contained in:
Narayan Kamath
2014-04-11 18:29:54 +00:00
committed by Gerrit Code Review
parent b093e485bb 2d84a406bf
commit 4f4892d00a
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/android/os/Process.java
View File

@ -372,7 +372,7 @@ public class Process {
for (int i = 0; i < tries; i++) { for (int i = 0; i < tries; i++) {
if (i > 0) { if (i > 0) {
try { try {
Log.i("Zygote", "Zygote not up yet, sleeping..."); Log.i(LOG_TAG, "Zygote not up yet, sleeping...");
Thread.sleep(ZYGOTE_RETRY_MILLIS); Thread.sleep(ZYGOTE_RETRY_MILLIS);
} catch (InterruptedException ex) { } catch (InterruptedException ex) {
throw new ZygoteStartFailedEx(ex); throw new ZygoteStartFailedEx(ex);
@ -707,6 +707,16 @@ public class Process {
return primaryZygoteState; return primaryZygoteState;
} }
// TODO: Get rid of this. This is a temporary workaround until all the
// compilation related pieces for the dual zygote stack are ready.
// b/3647418.
if (System.getenv("ANDROID_SOCKET_" + SECONDARY_ZYGOTE_SOCKET) == null) {
Log.e(LOG_TAG, "Forcing app to primary zygote, secondary unavailable (ABI= " + abi + ")");
// Should be :
// throw new ZygoteStartFailedEx("Unsupported zygote ABI: " + abi);
return primaryZygoteState;
}
// The primary zygote didn't match. Try the secondary. // The primary zygote didn't match. Try the secondary.
if (secondaryZygoteState == null || secondaryZygoteState.isClosed()) { if (secondaryZygoteState == null || secondaryZygoteState.isClosed()) {
secondaryZygoteState = ZygoteState.connect(SECONDARY_ZYGOTE_SOCKET, secondaryZygoteState = ZygoteState.connect(SECONDARY_ZYGOTE_SOCKET,