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

Commit 8f6e2c7a authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 8898488 from b12f59fa to tm-qpr1-release 

Change-Id: I2bc30ceb6c3d2abc463da57b8c29fb876ede2159
parents 3e783a0e b12f59fa

services/inputflinger/UnwantedInteractionBlocker.cpp

+2 −2
Original line number Diff line number Diff line
@@ -68,8 +68,8 @@ static ::base::TimeTicks toChromeTimestamp(nsecs_t eventTime) { 
static bool isPalmRejectionEnabled() {

    std::string value = toLower(

            server_configurable_flags::GetServerConfigurableFlag(INPUT_NATIVE_BOOT,

                                                                 PALM_REJECTION_ENABLED, "false"));

    if (value == "true" || value == "1") {

                                                                 PALM_REJECTION_ENABLED, "0"));

    if (value == "1") {

        return true;

    }

    return false;

services/surfaceflinger/SurfaceFlinger.cpp

+3 −5
Original line number Diff line number Diff line
@@ -2087,11 +2087,9 @@ bool SurfaceFlinger::commit(nsecs_t frameTime, int64_t vsyncId, nsecs_t expected 
    // Save this once per commit + composite to ensure consistency

    mPowerHintSessionEnabled = mPowerAdvisor->usePowerHintSession();

    if (mPowerHintSessionEnabled) {

        nsecs_t vsyncPeriod;

        {

            Mutex::Autolock lock(mStateLock);

            vsyncPeriod = getVsyncPeriodFromHWC();

        }

        const auto& display = FTL_FAKE_GUARD(mStateLock, getDefaultDisplayDeviceLocked()).get();

        // get stable vsync period from display mode

        const nsecs_t vsyncPeriod = display->getActiveMode()->getVsyncPeriod();

        mPowerAdvisor->setCommitStart(frameTime);

        mPowerAdvisor->setExpectedPresentTime(mExpectedPresentTime);

        const nsecs_t idealSfWorkDuration =