commit 4d890840a10839ce2165c3729c53cefa823065ad
author Prabir Pradhan <prabirmsp@google.com> Wed May 08 16:47:01 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 08 16:47:01 2024 +0000
tree d97e19f7baaec854ade30bb784ad7f7275325403
parent fd4a0ac773a800c36dcde4e30836b79e16306fcc
parent 32c79d02e04293b9b3ede427e54861074c700c1a

Merge "PointerIcon: Treat 0 as a valid type index for system icons" into main

core/java/android/view/PointerIcon.java

diff --git a/core/java/android/view/PointerIcon.java b/core/java/android/view/PointerIcon.java
index 7dc151d..71199e9 100644
--- a/core/java/android/view/PointerIcon.java
+++ b/core/java/android/view/PointerIcon.java
@@ -234,7 +234,7 @@
         }
 
         int typeIndex = getSystemIconTypeIndex(type);
-        if (typeIndex == 0) {
+        if (typeIndex < 0) {
             typeIndex = getSystemIconTypeIndex(TYPE_DEFAULT);
         }
 
@@ -606,7 +606,7 @@
             case TYPE_HANDWRITING:
                 return com.android.internal.R.styleable.Pointer_pointerIconHandwriting;
             default:
-                return 0;
+                return -1;
         }
     }