diff --git a/core/jni/android_view_SurfaceControl.cpp b/core/jni/android_view_SurfaceControl.cpp index 73b3f52f078b9..bc3593977a999 100644 --- a/core/jni/android_view_SurfaceControl.cpp +++ b/core/jni/android_view_SurfaceControl.cpp @@ -23,6 +23,7 @@ #include "android/graphics/Region.h" #include "core_jni_helpers.h" +#include #include #include #include @@ -495,8 +496,9 @@ static void nativeSetDisplayPowerMode(JNIEnv* env, jclass clazz, jobject tokenOb sp token(ibinderForJavaObject(env, tokenObj)); if (token == NULL) return; - ALOGD_IF_SLOW(100, "Excessive delay in setPowerMode()"); + android::base::Timer t; SurfaceComposerClient::setDisplayPowerMode(token, mode); + if (t.duration() > 100ms) ALOGD("Excessive delay in setPowerMode()"); } static jboolean nativeClearContentFrameStats(JNIEnv* env, jclass clazz, jlong nativeObject) { diff --git a/services/core/jni/com_android_server_lights_LightsService.cpp b/services/core/jni/com_android_server_lights_LightsService.cpp index bf91fe3fd0b48..dc6bc2ee42cfc 100644 --- a/services/core/jni/com_android_server_lights_LightsService.cpp +++ b/services/core/jni/com_android_server_lights_LightsService.cpp @@ -20,6 +20,7 @@ #include "JNIHelp.h" #include "android_runtime/AndroidRuntime.h" +#include #include #include #include @@ -137,8 +138,9 @@ static void setLight_native(JNIEnv* /* env */, jobject /* clazz */, jlong ptr, state.brightnessMode = brightnessMode; { - ALOGD_IF_SLOW(50, "Excessive delay setting light"); + android::base::Timer t; devices->lights[light]->set_light(devices->lights[light], &state); + if (t.duration() > 50ms) ALOGD("Excessive delay setting light"); } } diff --git a/services/core/jni/com_android_server_power_PowerManagerService.cpp b/services/core/jni/com_android_server_power_PowerManagerService.cpp index 048ef76ed4263..4bd7b63f8a27c 100644 --- a/services/core/jni/com_android_server_power_PowerManagerService.cpp +++ b/services/core/jni/com_android_server_power_PowerManagerService.cpp @@ -25,6 +25,7 @@ #include +#include #include #include #include @@ -125,22 +126,34 @@ static void nativeReleaseSuspendBlocker(JNIEnv *env, jclass /* clazz */, jstring static void nativeSetInteractive(JNIEnv* /* env */, jclass /* clazz */, jboolean enable) { if (gPowerModule) { if (enable) { - ALOGD_IF_SLOW(20, "Excessive delay in setInteractive(true) while turning screen on"); + android::base::Timer t; gPowerModule->setInteractive(gPowerModule, true); + if (t.duration() > 20ms) { + ALOGD("Excessive delay in setInteractive(true) while turning screen on"); + } } else { - ALOGD_IF_SLOW(20, "Excessive delay in setInteractive(false) while turning screen off"); + android::base::Timer t; gPowerModule->setInteractive(gPowerModule, false); + if (t.duration() > 20ms) { + ALOGD("Excessive delay in setInteractive(false) while turning screen off"); + } } } } static void nativeSetAutoSuspend(JNIEnv* /* env */, jclass /* clazz */, jboolean enable) { if (enable) { - ALOGD_IF_SLOW(100, "Excessive delay in autosuspend_enable() while turning screen off"); + android::base::Timer t; autosuspend_enable(); + if (t.duration() > 100ms) { + ALOGD("Excessive delay in autosuspend_enable() while turning screen off"); + } } else { - ALOGD_IF_SLOW(100, "Excessive delay in autosuspend_disable() while turning screen on"); + android::base::Timer t; autosuspend_disable(); + if (t.duration() > 100ms) { + ALOGD("Excessive delay in autosuspend_disable() while turning screen on"); + } } }