tequilaOS/platform_frameworks_native
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

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

Change-Id: I378e82dc2c6f1fe8506c7639f5c5244828589ea9
This commit is contained in:
Treehugger Robot 2020-06-08 17:02:28 +00:00 committed by Automerger Merge Worker
commit 49990b462a
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
services/inputflinger/reader/mapper/TouchInputMapper.cpp
View file

@ -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();