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

Commit 02177122 authored by Rachel Lee's avatar Rachel Lee Committed by Automerger Merge Worker
Browse files

Merge "Revert "Avoid vsync enabled when in DOZE mode (AOD)."" into tm-dev am:... 

Merge "Revert "Avoid vsync enabled when in DOZE mode (AOD)."" into tm-dev am: b337e18d am: f58eb4a8

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/17867958



Change-Id: I3ab7cbfadb20f2b9abedc89e3126c408e948aee2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2ea90239 f58eb4a8

services/surfaceflinger/DisplayHardware/HWComposer.cpp

+0 −6
Original line number Diff line number Diff line
@@ -376,11 +376,6 @@ void HWComposer::setVsyncEnabled(PhysicalDisplayId displayId, hal::Vsync enabled 
    }



    ATRACE_CALL();

    if (displayData.powerMode == hal::PowerMode::DOZE && enabled == hal::Vsync::ENABLE) {

        ALOGV("%s will not enable vsync for display %s due to power mode %s", __FUNCTION__,

              to_string(displayId).c_str(), to_string(displayData.powerMode).c_str());

        return;

    }

    auto error = displayData.hwcDisplay->setVsyncEnabled(enabled);

    RETURN_IF_HWC_ERROR(error, displayId);
@@ -557,7 +552,6 @@ status_t HWComposer::setPowerMode(PhysicalDisplayId displayId, hal::PowerMode mo 
        setVsyncEnabled(displayId, hal::Vsync::DISABLE);

    }



    mDisplayData[displayId].powerMode = mode;

    const auto& displayData = mDisplayData[displayId];

    auto& hwcDisplay = displayData.hwcDisplay;

    switch (mode) {

services/surfaceflinger/DisplayHardware/HWComposer.h

+0 −2
Original line number Diff line number Diff line
@@ -462,8 +462,6 @@ private: 
        std::mutex vsyncEnabledLock;

        hal::Vsync vsyncEnabled GUARDED_BY(vsyncEnabledLock) = hal::Vsync::DISABLE;



        hal::PowerMode powerMode = hal::PowerMode::ON;



        nsecs_t lastHwVsync = 0;

    };