commit 356026cfba3ffaadbb767e4353aa1b6f0004877c
author Seunghwan Choi <sbee.choi@samsung.corp-partner.google.com> Wed Feb 01 14:37:25 2023 +0900
committer Prabir Pradhan <prabirmsp@google.com> Thu Feb 02 18:10:10 2023 +0000
tree 2d690c287b74dc678cee76f2df7d2d6dbebf71c7
parent 2de48e444c13ef4b81ad55931b72594b6a9c56ff

Add testcase for StylusPointer

add testcases for styluspointer

Test: atest inputflinger_tests
Bug: b/215436642
Change-Id: I898f2af2ba81ef4048281baf105fcbba6269ec47

services/inputflinger/reader/mapper/TouchInputMapper.cpp

diff --git a/services/inputflinger/reader/mapper/TouchInputMapper.cpp b/services/inputflinger/reader/mapper/TouchInputMapper.cpp
index 9b2cf02..b789156 100644
--- a/services/inputflinger/reader/mapper/TouchInputMapper.cpp
+++ b/services/inputflinger/reader/mapper/TouchInputMapper.cpp
@@ -3709,7 +3709,8 @@
     const int32_t displayId = getAssociatedDisplayId().value_or(ADISPLAY_ID_NONE);
     const bool showDirectStylusPointer = mConfig.stylusPointerIconEnabled &&
             mDeviceMode == DeviceMode::DIRECT && isStylusEvent(source, action, pointerProperties) &&
-            displayId != ADISPLAY_ID_NONE && displayId == mPointerController->getDisplayId();
+            mPointerController && displayId != ADISPLAY_ID_NONE &&
+            displayId == mPointerController->getDisplayId();
     if (showDirectStylusPointer) {
         switch (action & AMOTION_EVENT_ACTION_MASK) {
             case AMOTION_EVENT_ACTION_HOVER_ENTER: