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

Commit 94ffe873 authored by Andy McFadden's avatar Andy McFadden Committed by Android (Google) Code Review
Browse files

Merge "Pass display arg to blank/unblank" into jb-mr1-dev

parents 053644db 1081eed9

services/jni/com_android_server_power_PowerManagerService.cpp

+4 −2
Original line number Original line Diff line number Diff line
@@ -183,14 +183,16 @@ static void nativeSetScreenState(JNIEnv *env, jclass clazz, jboolean on) { 
            gPowerModule->setInteractive(gPowerModule, true);

            gPowerModule->setInteractive(gPowerModule, true);

        }

        }





        const sp<IBinder>& display = s->getBuiltInDisplay(0);   // TODO: support multiple displays

        {

        {

            ALOGD_IF_SLOW(100, "Excessive delay in unblank() while turning screen on");

            ALOGD_IF_SLOW(100, "Excessive delay in unblank() while turning screen on");

            s->unblank();

            s->unblank(display);

        }

        }

    } else {

    } else {

        const sp<IBinder>& display = s->getBuiltInDisplay(0);   // TODO: support multiple displays

        {

        {

            ALOGD_IF_SLOW(100, "Excessive delay in blank() while turning screen off");

            ALOGD_IF_SLOW(100, "Excessive delay in blank() while turning screen off");

            s->blank();

            s->blank(display);

        }

        }





        if (gPowerModule) {

        if (gPowerModule) {