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

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

Merge "Make an AnrTimer flag non-read-only" into main

parents c82d24e9 83191779

apex/jobscheduler/service/java/com/android/server/job/JobServiceContext.java

+1 −1
Original line number Diff line number Diff line
@@ -322,7 +322,7 @@ public final class JobServiceContext implements ServiceConnection { 


    // All instances of JobAnrTimer share the same arguments.

    private static final AnrTimer.Args sAnrTimerArgs =

            new AnrTimer.Args().enable(com.android.server.utils.Flags.anrTimerJobService());

            new AnrTimer.Args().enable(com.android.server.utils.Flags.anrTimerForJobService());



    /**

     * An AnrTimer for the JobServiceContext.  There is one instance for each JobServiceContext

services/core/java/com/android/server/utils/flags.aconfig

+1 −2
Original line number Diff line number Diff line
@@ -10,9 +10,8 @@ flag { 
}



flag {

     name: "anr_timer_job_service"

     name: "anr_timer_for_job_service"

     namespace: "system_performance"

     is_fixed_read_only: true

     description: "Use AnrTimer to signal ANRs in JobScheduler"

     bug: "408440679"

}