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

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

Merge "Move AnrTimer to com.android.server.util" into main

parents e86d1246 55c53252

services/core/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -201,6 +201,7 @@ java_library_static { 
        "biometrics_flags_lib",

        "am_flags_lib",

        "com_android_wm_shell_flags_lib",

        "com.android.server.utils_aconfig-java",

        "service-jobscheduler-deviceidle.flags-aconfig-java",

    ],

    javac_shard_size: 50,

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

+1 −0
Original line number Diff line number Diff line
@@ -241,6 +241,7 @@ import com.android.server.am.LowMemDetector.MemFactor; 
import com.android.server.am.ServiceRecord.ShortFgsInfo;

import com.android.server.pm.KnownPackages;

import com.android.server.uri.NeededUriGrants;

import com.android.server.utils.AnrTimer;

import com.android.server.wm.ActivityServiceConnectionsHolder;



import java.io.FileDescriptor;

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

+1 −0
Original line number Diff line number Diff line
@@ -475,6 +475,7 @@ import com.android.server.sdksandbox.SdkSandboxManagerLocal; 
import com.android.server.uri.GrantUri;

import com.android.server.uri.NeededUriGrants;

import com.android.server.uri.UriGrantsManagerInternal;

import com.android.server.utils.AnrTimer;

import com.android.server.utils.PriorityDump;

import com.android.server.utils.Slogf;

import com.android.server.utils.TimingsTraceAndSlog;

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

+1 −0
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ import com.android.internal.util.FrameworkStatsLog; 
import com.android.server.am.BroadcastProcessQueue.BroadcastConsumer;

import com.android.server.am.BroadcastProcessQueue.BroadcastPredicate;

import com.android.server.am.BroadcastRecord.DeliveryState;

import com.android.server.utils.AnrTimer;



import dalvik.annotation.optimization.NeverCompile;

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

+0 −8
Original line number Diff line number Diff line
@@ -8,14 +8,6 @@ flag { 
    is_fixed_read_only: true

}



flag {

     name: "anr_timer_service_enabled"

     namespace: "system_performance"

     is_fixed_read_only: true

     description: "Feature flag for the ANR timer service"

     bug: "282428924"

}



flag {

    name: "fgs_abuse_detection"

    namespace: "backstage_power"