commit f3bbc7779b9c11277fafd4cedd6b7c77a835b0a9
author Prabir Pradhan <prabirmsp@google.com> Thu Mar 30 21:55:18 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 30 21:55:18 2023 +0000
tree 407314465be9bbc5a0c4762e6fbe09813fec397a
parent f9f553805deb7030819209b38a9a8fbdbe6efac2
parent eef8f55dc6f0a2dc6507bde6f5793bd94296b913

Merge "Add sysprop to force enabling stylus pointer icon for debugging" into udc-dev

core/java/android/hardware/input/InputManager.java

diff --git a/core/java/android/hardware/input/InputManager.java b/core/java/android/hardware/input/InputManager.java
index e7385b6..9cacfff 100644
--- a/core/java/android/hardware/input/InputManager.java
+++ b/core/java/android/hardware/input/InputManager.java
@@ -39,6 +39,7 @@
 import android.os.RemoteException;
 import android.os.SystemClock;
 import android.os.Vibrator;
+import android.sysprop.InputProperties;
 import android.util.Log;
 import android.view.Display;
 import android.view.InputDevice;
@@ -1123,7 +1124,8 @@
     public boolean isStylusPointerIconEnabled() {
         if (mIsStylusPointerIconEnabled == null) {
             mIsStylusPointerIconEnabled = getContext().getResources()
-                    .getBoolean(com.android.internal.R.bool.config_enableStylusPointerIcon);
+                    .getBoolean(com.android.internal.R.bool.config_enableStylusPointerIcon)
+                    || InputProperties.force_enable_stylus_pointer_icon().orElse(false);
         }
         return mIsStylusPointerIconEnabled;
     }