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

Commit ca2148c4 authored by Olivier Gaillard's avatar Olivier Gaillard Committed by Android (Google) Code Review
Browse files

Merge "Allow smaller watchdog timeouts for user debug builds to detect more regressions." into main

parents fdb5be8d c34dc0ee

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;