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

Commit 49990b46 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "TouchInputMapper: Use default viewport for PointerController" am: 69f1479a 

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

Change-Id: I378e82dc2c6f1fe8506c7639f5c5244828589ea9
parents ddb42315 69f1479a

services/inputflinger/reader/mapper/TouchInputMapper.cpp

+5 −1
Original line number Diff line number Diff line
@@ -771,7 +771,11 @@ void TouchInputMapper::configureSurface(nsecs_t when, bool* outResetNeeded) { 
        (mDeviceMode == DEVICE_MODE_DIRECT && mConfig.showTouches)) {

        if (mPointerController == nullptr || viewportChanged) {

            mPointerController = getPolicy()->obtainPointerController(getDeviceId());

            mPointerController->setDisplayViewport(mViewport);

            // Set the DisplayViewport for the PointerController to the default pointer display

            // that is recommended by the configuration before using it.

            std::optional<DisplayViewport> defaultViewport =

                    mConfig.getDisplayViewportById(mConfig.defaultPointerDisplayId);

            mPointerController->setDisplayViewport(defaultViewport.value_or(mViewport));

        }

    } else {

        mPointerController.clear();