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

Commit c34dc0ee authored by Olivier Gaillard's avatar Olivier Gaillard
Browse files

Allow smaller watchdog timeouts for user debug builds to detect more regressions. 

Change-Id: I47f48e9a4fa89cfa31968a73f37f9ec76e21f580
Bug: 209932320
parent d76f0471

services/core/java/com/android/server/Watchdog.java

+3 −2
Original line number Diff line number Diff line
@@ -453,7 +453,7 @@ public class Watchdog implements Dumpable { 
        mInterestingJavaPids.add(Process.myPid());



        // See the notes on DEFAULT_TIMEOUT.

        assert DB ||

        assert DB || Build.IS_USERDEBUG ||

                DEFAULT_TIMEOUT > ZygoteConnectionConstants.WRAPPED_PID_TIMEOUT_MILLIS;



        mTraceErrorLogger = new TraceErrorLogger();
@@ -527,7 +527,8 @@ public class Watchdog implements Dumpable { 
     */

    void updateWatchdogTimeout(long timeoutMillis) {

        // See the notes on DEFAULT_TIMEOUT.

        if (!DB && timeoutMillis <= ZygoteConnectionConstants.WRAPPED_PID_TIMEOUT_MILLIS) {

        if (!DB && !Build.IS_USERDEBUG

                && timeoutMillis <= ZygoteConnectionConstants.WRAPPED_PID_TIMEOUT_MILLIS) {

            timeoutMillis = ZygoteConnectionConstants.WRAPPED_PID_TIMEOUT_MILLIS + 1;

        }

        mWatchdogTimeoutMillis = timeoutMillis;