From 404fd65e436df7600bbb1b495720f8d1288b0d9d Mon Sep 17 00:00:00 2001 From: Christopher Tate Date: Fri, 22 Apr 2016 15:27:10 -0700 Subject: [PATCH] Raise native-crash socket timeout Stack unwinding can sometimes legitimately take more than 2 seconds. Bug 28210681 Change-Id: If6fb30c5111e9c85ce98d36a97faa0b5f21bc04d --- .../core/java/com/android/server/am/NativeCrashListener.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/am/NativeCrashListener.java b/services/core/java/com/android/server/am/NativeCrashListener.java index d0973d50fc3e6..e2870d8a07583 100644 --- a/services/core/java/com/android/server/am/NativeCrashListener.java +++ b/services/core/java/com/android/server/am/NativeCrashListener.java @@ -49,8 +49,8 @@ final class NativeCrashListener extends Thread { static final String DEBUGGERD_SOCKET_PATH = "/data/system/ndebugsocket"; // Use a short timeout on socket operations and abandon the connection - // on hard errors - static final long SOCKET_TIMEOUT_MILLIS = 2000; // 2 seconds + // on hard errors, just in case debuggerd goes out to lunch. + static final long SOCKET_TIMEOUT_MILLIS = 10000; // 10 seconds final ActivityManagerService mAm;