Reset intercept key wake time when receving up event
The policy need to handle the key shortcuts via policy callbacks,
and it may have a pending timeout in order to detect the combination
keys. If the pending key event has already known an up event has been
queued, we could reset the wake time to speed up the processing for it
may be handled in policy or not.
Bug: 220669913
Test: atest inputflinger_tests
Change-Id: Ic002b770632e15506fd2f581fc8716b26ea3626c
diff --git a/services/inputflinger/dispatcher/InputDispatcher.cpp b/services/inputflinger/dispatcher/InputDispatcher.cpp
index 06ad6a8..6bfac6c 100644
--- a/services/inputflinger/dispatcher/InputDispatcher.cpp
+++ b/services/inputflinger/dispatcher/InputDispatcher.cpp
@@ -1032,6 +1032,21 @@
}
}
}
+
+ // If a new up event comes in, and the pending event with same key code has been asked
+ // to try again later because of the policy. We have to reset the intercept key wake up
+ // time for it may have been handled in the policy and could be dropped.
+ if (keyEntry.action == AKEY_EVENT_ACTION_UP && mPendingEvent &&
+ mPendingEvent->type == EventEntry::Type::KEY) {
+ KeyEntry& pendingKey = static_cast<KeyEntry&>(*mPendingEvent);
+ if (pendingKey.keyCode == keyEntry.keyCode &&
+ pendingKey.interceptKeyResult ==
+ KeyEntry::INTERCEPT_KEY_RESULT_TRY_AGAIN_LATER) {
+ pendingKey.interceptKeyResult = KeyEntry::INTERCEPT_KEY_RESULT_UNKNOWN;
+ pendingKey.interceptKeyWakeupTime = 0;
+ needWake = true;
+ }
+ }
break;
}