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."

Browse Source
This commit is contained in:
Treehugger Robot
2022-12-20 02:06:51 +00:00
committed by Gerrit Code Review
parent 4f96be1506 78aae53eba
commit 5a3d902415
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);
} }
} }