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

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

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

Change-Id: I25702da3661f662babb448f9eb2a83a62f69f4d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Abel Hubena
2022-12-20 14:02:41 +00:00
committed by Automerger Merge Worker
parent 8faf3b51cf 405a99e5ae
commit 8cdb7855c2
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -73,8 +73,6 @@ public class ZygoteProcess {
private static final int ZYGOTE_CONNECT_TIMEOUT_MS = 20000; 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 * Use a relatively short delay, because for app zygote, this is in the critical path of
* service launch. * service launch.
@@ -1111,9 +1109,6 @@ public class ZygoteProcess {
state.mZygoteOutputWriter.flush(); 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); return (state.mZygoteInputStream.readInt() == 0);
} }
} }