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

Commit 5a7cc5f1 authored by Lee Shombert's avatar Lee Shombert
Browse files

Disable AnrTimer freezer option 

Remove the freeze() option from the two clients that are currently
using it.  The functionality has already been disabled and the
implementation will be removed in a follow-on commit.

Flag: com.android.server.utils.anr_timer_freezer
Bug: 406028115
Test: atest
 * FrameworksServicesTests:com.android.server.am
 * CtsAppTestCases
 * FrameworksServicesTests:AnrTimerTest
Change-Id: I9f55c73cd041d35087dcee4f72b8dc6a8fa8bc61
parent 197709fe

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