Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b12283f authored by Christopher Tate's avatar Christopher Tate Committed by android-build-merger
Browse files

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

am: aa1b2e2d

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

Change-Id: I7e763182c48f7ec1fd36196e4ecf991cd602e500
parents 7c7af7bd aa1b2e2d

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

+2 −2
Original line number Diff line number Diff line
@@ -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;