Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2ea9c0ca authored by Jeff Brown's avatar Jeff Brown Committed by Android Git Automerger
Browse files

am 329a5a90: am 07d655e6: am 637a30fd: Merge "Fix a segfault when there is no... 

am 329a5a90: am 07d655e6: am 637a30fd: Merge "Fix a segfault when there is no power module." into jb-mr1-dev

* commit '329a5a90':
  Fix a segfault when there is no power module.
parents b182b473 329a5a90

services/jni/com_android_server_power_PowerManagerService.cpp

+8 −6
Original line number 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) {

    if (gPowerModule) {

        if (enable) {

            ALOGD_IF_SLOW(20, "Excessive delay in setInteractive(true) while turning screen on");

            gPowerModule->setInteractive(gPowerModule, true);
@@ -176,6 +177,7 @@ static void nativeSetInteractive(JNIEnv *env, jclass clazz, jboolean enable) { 
            gPowerModule->setInteractive(gPowerModule, false);

        }

    }

}



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

    if (enable) {