Merge "Fix a segfault when there is no power module." into jb-mr1-dev (637a30fd) · Commits · e / os / android_frameworks_base

services/jni/com_android_server_power_PowerManagerService.cpp

+8 −6

Original line number	Original line	Diff line number	Diff line
	@@ -168,6 +168,7 @@ static void nativeReleaseSuspendBlocker(JNIEnv *env, jclass clazz, jstring nameS
	}		}

	static void nativeSetInteractive(JNIEnv *env, jclass clazz, jboolean enable) {		static void nativeSetInteractive(JNIEnv *env, jclass clazz, jboolean enable) {
			if (gPowerModule) {
	if (enable) {		if (enable) {
	ALOGD_IF_SLOW(20, "Excessive delay in setInteractive(true) while turning screen on");		ALOGD_IF_SLOW(20, "Excessive delay in setInteractive(true) while turning screen on");
	gPowerModule->setInteractive(gPowerModule, true);		gPowerModule->setInteractive(gPowerModule, true);
	@@ -176,6 +177,7 @@ static void nativeSetInteractive(JNIEnv *env, jclass clazz, jboolean enable) {
	gPowerModule->setInteractive(gPowerModule, false);		gPowerModule->setInteractive(gPowerModule, false);
	}		}
	}		}
			}

	static void nativeSetAutoSuspend(JNIEnv *env, jclass clazz, jboolean enable) {		static void nativeSetAutoSuspend(JNIEnv *env, jclass clazz, jboolean enable) {
	if (enable) {		if (enable) {