diff options
| author | 2024-01-18 19:38:36 +0000 | |
|---|---|---|
| committer | 2024-01-18 19:38:36 +0000 | |
| commit | d8693af7dd8af4ee842c5eed2294c72b936ce8c4 (patch) | |
| tree | 2227b19a96658141eeb5fbe365a4760354370339 | |
| parent | ca6cce5a9f54512334e879e0a561cf00614bd2f9 (diff) | |
| parent | 52edb583b8d088dc356f7b456d79419bc9c83e13 (diff) | |
Merge "Rename the AnrTimer trunk-stable flag" into main
| -rw-r--r-- | services/core/java/com/android/server/utils/AnrTimer.java | 2 | ||||
| -rw-r--r-- | services/core/java/com/android/server/utils/flags.aconfig | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/utils/AnrTimer.java b/services/core/java/com/android/server/utils/AnrTimer.java index e3aba0f6bc6f..c15ac37565ff 100644 --- a/services/core/java/com/android/server/utils/AnrTimer.java +++ b/services/core/java/com/android/server/utils/AnrTimer.java @@ -111,7 +111,7 @@ public class AnrTimer<V> implements AutoCloseable { * but it can be changed for local testing. */ private static boolean anrTimerServiceEnabled() { - return Flags.anrTimerServiceEnabled(); + return Flags.anrTimerService(); } /** diff --git a/services/core/java/com/android/server/utils/flags.aconfig b/services/core/java/com/android/server/utils/flags.aconfig index 489e21ab06ca..163116b9c5c7 100644 --- a/services/core/java/com/android/server/utils/flags.aconfig +++ b/services/core/java/com/android/server/utils/flags.aconfig @@ -1,7 +1,7 @@ package: "com.android.server.utils" flag { - name: "anr_timer_service_enabled" + name: "anr_timer_service" namespace: "system_performance" is_fixed_read_only: true description: "Feature flag for the ANR timer service" |