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

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

Merge "Address AnrTimer minor review comments" into main

parents a5813cbe 6f0e2b68

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);
@@ -115,10 +115,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);