commit 75789cd72bc516f3f9680a3f3c31a1e0015c1c98
author Seunghwan Choi <sbee.choi@samsung.corp-partner.google.com> Fri Jan 13 20:31:59 2023 +0900
committer Prabir Pradhan <prabirmsp@google.com> Thu Feb 02 08:33:29 2023 +0000
tree 1fcc0912f928b24216196c37195a38027008234c
parent 032c7dcf744f4c2c16755b4c34e0cc24abe54a7d

Separate default pointer for mouse and stylus (native part)

Let PointerController (MouseCursorController) know the source of
the current event, either mouse or stylus.
MouseCursorController will show the proper default pointer for
the active source, if the requested pointer type is TYPE_NOT_SPECIFIED.

Test: Manual Test
Bug: b/215436642
Change-Id: I91f702db661846fc7ad857f71656903c8aa4334a

services/inputflinger/reader/mapper/TouchInputMapper.cpp

diff --git a/services/inputflinger/reader/mapper/TouchInputMapper.cpp b/services/inputflinger/reader/mapper/TouchInputMapper.cpp
index 9003e58..dc27622 100644
--- a/services/inputflinger/reader/mapper/TouchInputMapper.cpp
+++ b/services/inputflinger/reader/mapper/TouchInputMapper.cpp
@@ -3699,13 +3699,14 @@
             ALOG_ASSERT(false);
         }
     }
-    const bool isStylus = isStylusEvent(source, action, pointerProperties);
-    if (isStylus) {
+    const bool isDirectStylus =
+            mDeviceMode == DeviceMode::DIRECT && isStylusEvent(source, action, pointerProperties);
+    if (isDirectStylus) {
         switch (action & AMOTION_EVENT_ACTION_MASK) {
             case AMOTION_EVENT_ACTION_HOVER_ENTER:
             case AMOTION_EVENT_ACTION_HOVER_MOVE:
                 mPointerController->setPresentation(
-                        PointerControllerInterface::Presentation::POINTER);
+                        PointerControllerInterface::Presentation::STYLUS_HOVER);
                 mPointerController
                         ->setPosition(mCurrentCookedState.cookedPointerData.pointerCoords[0].getX(),
                                       mCurrentCookedState.cookedPointerData.pointerCoords[0]