Fix a segfault when there is no power module.

Jeff Brown · Jeff Brown · commit 0a19d001c4ff · 2012-10-09T14:47:05.000-07:00
This can happen in the emulator.

Bug: 7315152
Change-Id: I4a3f547127419fcd4dc4fc1c6f7ee869706cf12e
diff --git a/services/jni/com_android_server_power_PowerManagerService.cpp b/services/jni/com_android_server_power_PowerManagerService.cpp
@@ -168,12 +168,14 @@ static void nativeReleaseSuspendBlocker(JNIEnv *env, jclass clazz, jstring nameS
 }
 
 static void nativeSetInteractive(JNIEnv *env, jclass clazz, jboolean enable) {
-    if (enable) {
-        ALOGD_IF_SLOW(20, "Excessive delay in setInteractive(true) while turning screen on");
-        gPowerModule->setInteractive(gPowerModule, true);
-    } else {
-        ALOGD_IF_SLOW(20, "Excessive delay in setInteractive(false) while turning screen off");
-        gPowerModule->setInteractive(gPowerModule, false);
+    if (gPowerModule) {
+        if (enable) {
+            ALOGD_IF_SLOW(20, "Excessive delay in setInteractive(true) while turning screen on");
+            gPowerModule->setInteractive(gPowerModule, true);
+        } else {
+            ALOGD_IF_SLOW(20, "Excessive delay in setInteractive(false) while turning screen off");
+            gPowerModule->setInteractive(gPowerModule, false);
+        }
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -168,12 +168,14 @@ static void nativeReleaseSuspendBlocker(JNIEnv *env, jclass clazz, jstring nameS`
`168`	`168`	`}`
`169`	`169`
`170`	`170`	`static void nativeSetInteractive(JNIEnv *env, jclass clazz, jboolean enable) {`
`171`		`- if (enable) {`
`172`		`- ALOGD_IF_SLOW(20, "Excessive delay in setInteractive(true) while turning screen on");`
`173`		`- gPowerModule->setInteractive(gPowerModule, true);`
`174`		`- } else {`
`175`		`- ALOGD_IF_SLOW(20, "Excessive delay in setInteractive(false) while turning screen off");`
`176`		`- gPowerModule->setInteractive(gPowerModule, false);`
	`171`	`+ if (gPowerModule) {`
	`172`	`+ if (enable) {`
	`173`	`+ ALOGD_IF_SLOW(20, "Excessive delay in setInteractive(true) while turning screen on");`
	`174`	`+ gPowerModule->setInteractive(gPowerModule, true);`
	`175`	`+ } else {`
	`176`	`+ ALOGD_IF_SLOW(20, "Excessive delay in setInteractive(false) while turning screen off");`
	`177`	`+ gPowerModule->setInteractive(gPowerModule, false);`
	`178`	`+ }`
`177`	`179`	`}`
`178`	`180`	`}`
`179`	`181`