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

Commit 5a3d9024 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

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

parents 4f96be15 78aae53e
Loading
Loading
Loading
Loading
+5 −0
Original line number Diff line number Diff line
@@ -73,6 +73,8 @@ 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.
@@ -1109,6 +1111,9 @@ 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);
        }
    }