commit 637a30fde7d1754f8b8a76c08326e1c432ffd93d
author Jeff Brown <jeffbrown@google.com> Tue Oct 09 16:51:49 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Oct 09 16:51:49 2012 -0700
tree f386172000b5dd5a0e6e72ddcc17d084322c61e3
parent 79dc154afeece0db6ef602c70a34dd69bada03dc
parent 0a19d001c4ffbeec7e4e23b7640fff6bd7f11bc7

Merge "Fix a segfault when there is no power module." into jb-mr1-dev

services/jni/com_android_server_power_PowerManagerService.cpp

diff --git a/services/jni/com_android_server_power_PowerManagerService.cpp b/services/jni/com_android_server_power_PowerManagerService.cpp
index 75f77b9..23c33af 100644
--- a/services/jni/com_android_server_power_PowerManagerService.cpp
+++ b/services/jni/com_android_server_power_PowerManagerService.cpp
@@ -168,12 +168,14 @@
 }
 
 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);
+        }
     }
 }