Skip to content

Commit 637a30f

Browse files
Jeff BrownAndroid (Google) Code Review
authored andcommitted
Merge "Fix a segfault when there is no power module." into jb-mr1-dev
2 parents 79dc154 + 0a19d00 commit 637a30f

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

services/jni/com_android_server_power_PowerManagerService.cpp

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -168,12 +168,14 @@ static void nativeReleaseSuspendBlocker(JNIEnv *env, jclass clazz, jstring nameS
168168
}
169169

170170
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+
}
177179
}
178180
}
179181

0 commit comments

Comments
 (0)