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

Commit 678dc847 authored by Jeff Brown's avatar Jeff Brown Committed by Android Git Automerger
Browse files

am d36b33f5: am 067b4732: Merge "Use more reasonable warning thresholds for... 

am d36b33f5: am 067b4732: Merge "Use more reasonable warning thresholds for power on/off." into jb-mr1-dev

* commit 'd36b33f5':
  Use more reasonable warning thresholds for power on/off.
parents 8099dc4c d36b33f5

services/jni/com_android_server_power_PowerManagerService.cpp

+6 −6
Original line number Diff line number Diff line
@@ -174,32 +174,32 @@ static void nativeSetScreenState(JNIEnv *env, jclass clazz, jboolean on) { 
    sp<ISurfaceComposer> s(ComposerService::getComposerService());

    if (on) {

        {

            ALOGD_IF_SLOW(50, "Excessive delay in autosuspend_disable() while turning screen on");

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

            autosuspend_disable();

        }



        if (gPowerModule) {

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

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

            gPowerModule->setInteractive(gPowerModule, true);

        }



        {

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

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

            s->unblank();

        }

    } else {

        {

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

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

            s->blank();

        }



        if (gPowerModule) {

            ALOGD_IF_SLOW(10, "Excessive delay in setInteractive(false) while turning screen off");

            ALOGD_IF_SLOW(20, "Excessive delay in setInteractive(false) while turning screen off");

            gPowerModule->setInteractive(gPowerModule, false);

        }



        {

            ALOGD_IF_SLOW(50, "Excessive delay in autosuspend_enable() while turning screen off");

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

            autosuspend_enable();

        }

    }