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

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

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

Change-Id: If2a3855d8ae3a2ae76b74eed57651549c470d337
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2022-12-20 02:13:33 +00:00
committed by Automerger Merge Worker
parent 9473b54e9b 5a3d902415
commit 4c0abd3227
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -73,6 +73,8 @@ 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.
@@ -1109,6 +1111,9 @@ 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);
} }
} }