Merge "Remove ALOGD_IF_SLOW" (b793aa8c) · Commits · e / os / android_frameworks_base

core/jni/android_view_SurfaceControl.cpp

+3 −1

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@
		#include "android/graphics/Region.h"
		#include "core_jni_helpers.h"

		#include <android-base/chrono_utils.h>
		#include <JNIHelp.h>
		#include <ScopedUtfChars.h>
		#include <android_runtime/android_view_Surface.h>
		@@ -495,8 +496,9 @@ static void nativeSetDisplayPowerMode(JNIEnv* env, jclass clazz, jobject tokenOb
		sp<IBinder> 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) {

services/core/jni/com_android_server_lights_LightsService.cpp

+3 −1

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@
		#include "JNIHelp.h"
		#include "android_runtime/AndroidRuntime.h"

		#include <android-base/chrono_utils.h>
		#include <utils/misc.h>
		#include <utils/Log.h>
		#include <hardware/hardware.h>
		@@ -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");
		}
		}

services/core/jni/com_android_server_power_PowerManagerService.cpp

+17 −4

Original line number	Diff line number	Diff line
		@@ -25,6 +25,7 @@

		#include <limits.h>

		#include <android-base/chrono_utils.h>
		#include <android_runtime/AndroidRuntime.h>
		#include <android_runtime/Log.h>
		#include <utils/Timers.h>
		@@ -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");
		}
		}
		}