Merge "PointerIcon: Treat 0 as a valid type index for system icons" into main (4d890840) · Commits · e / os / android_frameworks_base

core/java/android/view/PointerIcon.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -234,7 +234,7 @@ public final class PointerIcon implements Parcelable {
		}

		int typeIndex = getSystemIconTypeIndex(type);
		if (typeIndex == 0) {
		if (typeIndex < 0) {
		typeIndex = getSystemIconTypeIndex(TYPE_DEFAULT);
		}

		@@ -606,7 +606,7 @@ public final class PointerIcon implements Parcelable {
		case TYPE_HANDWRITING:
		return com.android.internal.R.styleable.Pointer_pointerIconHandwriting;
		default:
		return 0;
		return -1;
		}
		}