Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 15f8fb42 authored by Josh Gao's avatar Josh Gao Committed by android-build-merger
Browse files

Merge "zygote: respond and wait for reply to --boot-completed." 

am: d34e18c0

Change-Id: I47819fa73d07ecc3507b03ef446f606407830b29
parents af89aaa6 d34e18c0

core/java/android/os/ZygoteProcess.java

+1 −0
Original line number Diff line number Diff line
@@ -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

+6 −0
Original line number Diff line number Diff line
@@ -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();

    }