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

Commit ea639edc authored by Abel Hubena's avatar Abel Hubena Committed by Automerger Merge Worker
Browse files

Merge "Revert "[Bugfix] Add reading timeout when waiting for the reply of an... 

Merge "Revert "[Bugfix] Add reading timeout when waiting for the reply of an application zygote."" am: 405a99e5 am: 8cdb7855

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2363304



Change-Id: Icc6da2e5d13dcb92147647db7c4f424fc98936b0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a5c6a1f9 8cdb7855

core/java/android/os/ZygoteProcess.java

+0 −5
Original line number Diff line number Diff line
@@ -73,8 +73,6 @@ public class ZygoteProcess { 


    private static final int ZYGOTE_CONNECT_TIMEOUT_MS = 20000;



    private static final int APPLICATION_ZYGOTE_READ_TIMEOUT_MS = 5000;



    /**

     * Use a relatively short delay, because for app zygote, this is in the critical path of

     * service launch.
@@ -1111,9 +1109,6 @@ public class ZygoteProcess { 


            state.mZygoteOutputWriter.flush();



            // The system_server should not be blocked by a defective or bad application zygote.

            state.mZygoteSessionSocket.setSoTimeout(APPLICATION_ZYGOTE_READ_TIMEOUT_MS);



            return (state.mZygoteInputStream.readInt() == 0);

        }

    }