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

Commit e46ebecf 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 am: 352a7180 

am: 4bbae5ee

* commit '4bbae5ee':
  Raise native-crash socket timeout

Change-Id: Ifd1a1ee42161f17535f23db78fb6c56d66e4c998
parents 98eec67c 4bbae5ee

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;