From 6f0e2b680d192bfcaca246f551818f9f54218639 Mon Sep 17 00:00:00 2001 From: Lee Shombert Date: Sun, 7 Jan 2024 10:44:50 -0800 Subject: Address AnrTimer minor review comments This CL address two review comments from an earlier commit: 1. The call to register_android_server_utils_AnrTimer() is now sorted, per the style guide. 2. An iterator error is fixed in AnrTimerService::Ticker::remove(). Test: atest * FrameworksServicesTests:com.android.server.am * FrameworksMockingServicesTests:com.android.server.am * CtsAppTestCases * FrameworksServicesTests:AnrTimerTest Bug: 282428924 Change-Id: Id35076ae4f477330c455275f502ab39b2265745a --- services/core/jni/com_android_server_utils_AnrTimer.cpp | 6 ++++-- services/core/jni/onload.cpp | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/services/core/jni/com_android_server_utils_AnrTimer.cpp b/services/core/jni/com_android_server_utils_AnrTimer.cpp index 97b18fac91f4..1e48aced0041 100644 --- a/services/core/jni/com_android_server_utils_AnrTimer.cpp +++ b/services/core/jni/com_android_server_utils_AnrTimer.cpp @@ -486,9 +486,11 @@ class AnrTimerService::Ticker { void remove(AnrTimerService const* service) { AutoMutex _l(lock_); timer_id_t front = headTimerId(); - for (auto i = running_.begin(); i != running_.end(); i++) { + for (auto i = running_.begin(); i != running_.end(); ) { if (i->service == service) { - running_.erase(i); + i = running_.erase(i); + } else { + i++; } } if (front != headTimerId()) restartLocked(); diff --git a/services/core/jni/onload.cpp b/services/core/jni/onload.cpp index f3158d11b9a4..5d1eb496903b 100644 --- a/services/core/jni/onload.cpp +++ b/services/core/jni/onload.cpp @@ -52,10 +52,10 @@ int register_android_server_Watchdog(JNIEnv* env); int register_android_server_HardwarePropertiesManagerService(JNIEnv* env); int register_android_server_SyntheticPasswordManager(JNIEnv* env); int register_android_hardware_display_DisplayViewport(JNIEnv* env); -int register_android_server_utils_AnrTimer(JNIEnv *env); int register_android_server_am_OomConnection(JNIEnv* env); int register_android_server_am_CachedAppOptimizer(JNIEnv* env); int register_android_server_am_LowMemDetector(JNIEnv* env); +int register_android_server_utils_AnrTimer(JNIEnv *env); int register_com_android_server_soundtrigger_middleware_AudioSessionProviderImpl(JNIEnv* env); int register_com_android_server_soundtrigger_middleware_ExternalCaptureStateTracker(JNIEnv* env); int register_android_server_com_android_server_pm_PackageManagerShellCommandDataLoader(JNIEnv* env); @@ -114,10 +114,10 @@ extern "C" jint JNI_OnLoad(JavaVM* vm, void* /* reserved */) register_android_server_storage_AppFuse(env); register_android_server_SyntheticPasswordManager(env); register_android_hardware_display_DisplayViewport(env); - register_android_server_utils_AnrTimer(env); register_android_server_am_OomConnection(env); register_android_server_am_CachedAppOptimizer(env); register_android_server_am_LowMemDetector(env); + register_android_server_utils_AnrTimer(env); register_com_android_server_soundtrigger_middleware_AudioSessionProviderImpl(env); register_com_android_server_soundtrigger_middleware_ExternalCaptureStateTracker(env); register_android_server_com_android_server_pm_PackageManagerShellCommandDataLoader(env); -- cgit v1.2.3-59-g8ed1b