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

am: 332a53756d

Change-Id: If284835a381f6f7c300c62edc59d1cf9743ac815

core/java/android/os/ZygoteProcess.java

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

core/java/com/android/internal/os/ZygoteConnection.java

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