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

Merge "zygote: respond and wait for reply to --boot-completed." am: d34e18c036 am: 15f8fb42d6

Browse Source 
am: 332a53756d

Change-Id: If284835a381f6f7c300c62edc59d1cf9743ac815
This commit is contained in:
Josh Gao
2019-10-03 11:11:44 -07:00
committed by android-build-merger
parent a38617f047 332a53756d
commit cca303ecd9
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/java/android/os/ZygoteProcess.java
View File

@@ -760,6 +760,7 @@ public class ZygoteProcess {
ZygoteState state = openZygoteSocketIfNeeded(abi); ZygoteState state = openZygoteSocketIfNeeded(abi);
state.mZygoteOutputWriter.write("1\n--boot-completed\n"); state.mZygoteOutputWriter.write("1\n--boot-completed\n");
state.mZygoteOutputWriter.flush(); state.mZygoteOutputWriter.flush();
state.mZygoteInputStream.readInt();
} }
} catch (Exception ex) { } catch (Exception ex) {
throw new RuntimeException("Failed to inform zygote of boot_completed", ex); throw new RuntimeException("Failed to inform zygote of boot_completed", ex);

6
core/java/com/android/internal/os/ZygoteConnection.java
View File

@@ -305,6 +305,12 @@ class ZygoteConnection {
} }
private void handleBootCompleted() { private void handleBootCompleted() {
try {
mSocketOutStream.writeInt(0);
} catch (IOException ioe) {
throw new IllegalStateException("Error writing to command socket", ioe);
}
VMRuntime.bootCompleted(); VMRuntime.bootCompleted();
} }