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

Commit 6f0e2b68 authored by Lee Shombert's avatar Lee Shombert
Browse files

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
parent ab4ae770

services/core/jni/com_android_server_utils_AnrTimer.cpp

+4 −2
Original line number Diff line number Diff line
@@ -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();

services/core/jni/onload.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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);