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

Commit de1eb9c0 authored by Matthew Bouyack's avatar Matthew Bouyack Committed by Android (Google) Code Review
Browse files

Merge "Eliminate redundant changes to hardware vsync state."

parents aaaebd9a cd9b55c7

services/surfaceflinger/SurfaceFlinger.cpp

+4 −2
Original line number Diff line number Diff line
@@ -3443,7 +3443,8 @@ void SurfaceFlinger::setPowerModeInternal(const sp<DisplayDevice>& hw, 
            ALOGW("Couldn't set SCHED_OTHER on display off");

        }



        if (type == DisplayDevice::DISPLAY_PRIMARY) {

        if (type == DisplayDevice::DISPLAY_PRIMARY &&

            currentMode != HWC_POWER_MODE_DOZE_SUSPEND) {

            disableHardwareVsync(true); // also cancels any in-progress resync



            // FIXME: eventthread only knows about the main display right now
@@ -3457,7 +3458,8 @@ void SurfaceFlinger::setPowerModeInternal(const sp<DisplayDevice>& hw, 
               mode == HWC_POWER_MODE_NORMAL) {

        // Update display while dozing

        getHwComposer().setPowerMode(type, mode);

        if (type == DisplayDevice::DISPLAY_PRIMARY) {

        if (type == DisplayDevice::DISPLAY_PRIMARY &&

            currentMode == HWC_POWER_MODE_DOZE_SUSPEND) {

            // FIXME: eventthread only knows about the main display right now

            mEventThread->onScreenAcquired();

            resyncToHardwareVsync(true);

services/surfaceflinger/SurfaceFlinger_hwc1.cpp

+4 −2
Original line number Diff line number Diff line
@@ -2948,7 +2948,8 @@ void SurfaceFlinger::setPowerModeInternal(const sp<DisplayDevice>& hw, 
            ALOGW("Couldn't set SCHED_OTHER on display off");

        }



        if (type == DisplayDevice::DISPLAY_PRIMARY) {

        if (type == DisplayDevice::DISPLAY_PRIMARY &&

            currentMode != HWC_POWER_MODE_DOZE_SUSPEND) {

            disableHardwareVsync(true); // also cancels any in-progress resync



            // FIXME: eventthread only knows about the main display right now
@@ -2962,7 +2963,8 @@ void SurfaceFlinger::setPowerModeInternal(const sp<DisplayDevice>& hw, 
               mode == HWC_POWER_MODE_NORMAL) {

        // Update display while dozing

        getHwComposer().setPowerMode(type, mode);

        if (type == DisplayDevice::DISPLAY_PRIMARY) {

        if (type == DisplayDevice::DISPLAY_PRIMARY &&

            currentMode == HWC_POWER_MODE_DOZE_SUSPEND) {

            // FIXME: eventthread only knows about the main display right now

            mEventThread->onScreenAcquired();

            resyncToHardwareVsync(true);