diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 5589244660472..81db473d7014d 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -8228,7 +8228,10 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
             // in onHoverEvent.
             // Note that onGenericMotionEvent will be called by default when
             // onHoverEvent returns false (refer to dispatchGenericMotionEvent).
-            return dispatchGenericMotionEventInternal(event);
+            dispatchGenericMotionEventInternal(event);
+            // The event was already handled by calling setHovered(), so always
+            // return true.
+            return true;
         }
 
         return false;