From d0f6cb39f3fb9136a339fa74446550f27b0e9b35 Mon Sep 17 00:00:00 2001
From: Haoyu Zhang <haoyuchang@google.com>
Date: Wed, 29 Mar 2023 14:33:09 -0700
Subject: [PATCH] Do not update PointerIcon when stylus is not hovering

Updated maybeUpdatePointerIcon so that it only updates hover icon when
stylus is hovering.

Bug: 275851541
Test: manually tested
Change-Id: I08166f2fad3fe6da50bc142bc03223b99538780e
---
 core/java/android/view/ViewRootImpl.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java
index 2f5cd5434b899..055b5cb705625 100644
--- a/core/java/android/view/ViewRootImpl.java
+++ b/core/java/android/view/ViewRootImpl.java
@@ -6946,6 +6946,7 @@ public final class ViewRootImpl implements ViewParent,
                 return;
             }
             final boolean needsStylusPointerIcon = event.isStylusPointer()
+                    && event.isHoverEvent()
                     && mInputManager.isStylusPointerIconEnabled();
             if (needsStylusPointerIcon || event.isFromSource(InputDevice.SOURCE_MOUSE)) {
                 if (event.getActionMasked() == MotionEvent.ACTION_HOVER_ENTER