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

Commit 72d1200d authored by Lee Shombert's avatar Lee Shombert Committed by Android (Google) Code Review
Browse files

Merge "Disable AnrTimer freezer option" into main

parents babf7838 5a7cc5f1

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

+1 −1
Original line number Diff line number Diff line
@@ -784,7 +784,7 @@ public final class ActiveServices { 
        this.mActiveServiceAnrTimer = new ProcessAnrTimer(service,

                ActivityManagerService.SERVICE_TIMEOUT_MSG,

                "SERVICE_TIMEOUT",

                new AnrTimer.Args().freeze(true));

                new AnrTimer.Args());

        this.mShortFGSAnrTimer = new ServiceAnrTimer(service,

                ActivityManagerService.SERVICE_SHORT_FGS_ANR_TIMEOUT_MSG,

                "SHORT_FGS_TIMEOUT");

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

+1 −1
Original line number Diff line number Diff line
@@ -1351,7 +1351,7 @@ class BroadcastQueueImpl extends BroadcastQueue { 
        BroadcastAnrTimer(@NonNull Handler handler) {

            super(Objects.requireNonNull(handler),

                    MSG_DELIVERY_TIMEOUT, "BROADCAST_TIMEOUT",

                    new AnrTimer.Args().extend(true).freeze(true));

                    new AnrTimer.Args().extend(true));

        }



        @Override