From acb493eaeb7d278324936956da48df9f3b7c4cb4 Mon Sep 17 00:00:00 2001 From: Abel Hubena Date: Tue, 20 Dec 2022 11:50:55 +0000 Subject: [PATCH] Revert "[Bugfix] Add reading timeout when waiting for the reply of an application zygote." This reverts commit 78aae53eba419bd919c1db9002f1bceb434d2297. Reason for revert: DroidMonitor:triggered revert due to breakage https://android-build.googleplex.com/builds/tests/view?testResultId=TR95728429014952829&invocationId=I79800010118530753 Bug: b/263202138 Change-Id: I27e039ef8379752a6e71e8155dc13624b93409be --- core/java/android/os/ZygoteProcess.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/core/java/android/os/ZygoteProcess.java b/core/java/android/os/ZygoteProcess.java index 0b6a99b0ae98e..3cb5c60259ebc 100644 --- a/core/java/android/os/ZygoteProcess.java +++ b/core/java/android/os/ZygoteProcess.java @@ -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); } }