commit ba6f333c7d2df0f65d84255dfaf36436265236cb
author Treehugger Robot <treehugger-gerrit@google.com> Tue Dec 01 01:22:54 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Dec 01 01:22:54 2020 +0000
tree 7bff113b3ccf5b70ce82282242b43a2d0b6d664c
parent 93ba79f6ecaa01cdc6cc38aa2ad0b030aa8ffd90
parent e0aa154f306c8feaabb1a2c3c277bb282186c4ed

Merge "Touchpad Capture: Fix issues with Pointer Controller" am: 4aaa310584 am: e0aa154f30

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

Change-Id: Ice321764974d67738fd6e99e50aba670ea766f66

services/inputflinger/reader/mapper/TouchInputMapper.cpp

diff --git a/services/inputflinger/reader/mapper/TouchInputMapper.cpp b/services/inputflinger/reader/mapper/TouchInputMapper.cpp
index 04a5c4f..0b541fb 100644
--- a/services/inputflinger/reader/mapper/TouchInputMapper.cpp
+++ b/services/inputflinger/reader/mapper/TouchInputMapper.cpp
@@ -781,12 +781,17 @@
         mOrientedRanges.clear();
     }
 
-    // Create pointer controller if needed.
+    // Create pointer controller if needed, and keep it around if Pointer Capture is enabled to
+    // preserve the cursor position.
     if (mDeviceMode == DeviceMode::POINTER ||
-        (mDeviceMode == DeviceMode::DIRECT && mConfig.showTouches)) {
+        (mDeviceMode == DeviceMode::DIRECT && mConfig.showTouches) ||
+        (mParameters.deviceType == Parameters::DeviceType::POINTER && mConfig.pointerCapture)) {
         if (mPointerController == nullptr) {
             mPointerController = getContext()->getPointerController(getDeviceId());
         }
+        if (mConfig.pointerCapture) {
+            mPointerController->fade(PointerControllerInterface::Transition::IMMEDIATE);
+        }
     } else {
         mPointerController.reset();
     }