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

Commit 838f3c4d authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 5631102 from 06acef53 to qt-c2f2-release 

Change-Id: I8f7936cab0997c651b4921e43f4203369a0f03b6
parents 576f6094 06acef53

services/inputflinger/InputDispatcher.cpp

+1 −2
Original line number Diff line number Diff line
@@ -2172,9 +2172,8 @@ void InputDispatcher::dispatchPointerDownOutsideFocus(uint32_t source, int32_t a 
        return;

    }



    int32_t displayId = inputWindowHandle->getInfo()->displayId;

    sp<InputWindowHandle> focusedWindowHandle =

            getValueByKey(mFocusedWindowHandlesByDisplay, displayId);

            getValueByKey(mFocusedWindowHandlesByDisplay, mFocusedDisplayId);



    bool hasFocusChanged = !focusedWindowHandle || focusedWindowHandle->getToken() != newToken;

services/surfaceflinger/Scheduler/Scheduler.h

+1 −1
Original line number Diff line number Diff line
@@ -297,7 +297,7 @@ private: 
    const scheduler::RefreshRateConfigs& mRefreshRateConfigs;



    // Global config to force HDR content to work on DEFAULT refreshRate

    static constexpr bool mForceHDRContentToDefaultRefreshRate = true;

    static constexpr bool mForceHDRContentToDefaultRefreshRate = false;

};



} // namespace android