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

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

Browse Source 
am: aa1b2e2

* commit 'aa1b2e2d4e47ae186df31ffe10f1ed05b951b753':
  Raise native-crash socket timeout

Change-Id: Ie048bfcf8a0843375517f413093a604053bd255e
This commit is contained in:
Christopher Tate
2016-04-22 23:44:57 +00:00
committed by android-build-merger
parent 0b43e90a0d aa1b2e2d4e
commit 352a71807c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/am/NativeCrashListener.java
View File

@@ -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;