commit f14f02e6759c307d97cdf44a9b57979eeeeb47b8
author Siarhei Vishniakou <svv@google.com> Wed Apr 12 22:00:45 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Apr 12 22:00:45 2023 +0000
tree acd8cce0a2093403e019b27090e862d2e4d4cc71
parent efe9e0f7a116a2dfe46ec4b0f0f0b3995012f18e
parent cda245feee2ceba5f5c45578273b071974c8e461

Merge "Expand fatal log for HOVER_MOVE" into udc-dev am: cda245feee

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/22582931

Change-Id: I47dad714221cec42c3fd60e1c480b9d4bf1cda18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

services/inputflinger/dispatcher/InputDispatcher.cpp

diff --git a/services/inputflinger/dispatcher/InputDispatcher.cpp b/services/inputflinger/dispatcher/InputDispatcher.cpp
index 6e2f862..851f13c 100644
--- a/services/inputflinger/dispatcher/InputDispatcher.cpp
+++ b/services/inputflinger/dispatcher/InputDispatcher.cpp
@@ -626,7 +626,9 @@
             touchedWindow.targetFlags = InputTarget::Flags::DISPATCH_AS_HOVER_ENTER;
         } else {
             // This pointer was already sent to the window. Use ACTION_HOVER_MOVE.
-            LOG_ALWAYS_FATAL_IF(maskedAction != AMOTION_EVENT_ACTION_HOVER_MOVE);
+            if (CC_UNLIKELY(maskedAction != AMOTION_EVENT_ACTION_HOVER_MOVE)) {
+                LOG(FATAL) << "Expected ACTION_HOVER_MOVE instead of " << entry.getDescription();
+            }
             touchedWindow.targetFlags = InputTarget::Flags::DISPATCH_AS_IS;
         }
         touchedWindow.pointerIds.set(pointerId);