commit aa1b2e2d4e47ae186df31ffe10f1ed05b951b753
author Chris Tate <ctate@android.com> Fri Apr 22 23:31:02 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 22 23:31:03 2016 +0000
tree 39b425effcd53fff640941676fd1706fae55e643
parent f39f04407e6c50d57aaa2358b2f46bc79a94cf4f
parent 404fd65e436df7600bbb1b495720f8d1288b0d9d

Merge "Raise native-crash socket timeout" into nyc-dev

services/core/java/com/android/server/am/NativeCrashListener.java

diff --git a/services/core/java/com/android/server/am/NativeCrashListener.java b/services/core/java/com/android/server/am/NativeCrashListener.java
index d0973d5..e2870d8 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 @@
     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;