Merge "InputTracer: Disallow adding new targets from a derived event tracker" into main
diff --git a/services/inputflinger/dispatcher/trace/InputTracer.cpp b/services/inputflinger/dispatcher/trace/InputTracer.cpp
index 49e6e21..4cf6a89 100644
--- a/services/inputflinger/dispatcher/trace/InputTracer.cpp
+++ b/services/inputflinger/dispatcher/trace/InputTracer.cpp
@@ -101,14 +101,15 @@
void InputTracer::dispatchToTargetHint(const EventTrackerInterface& cookie,
const InputTarget& target) {
- if (isDerivedCookie(cookie)) {
- LOG(FATAL) << "Event target cannot be updated from a derived cookie.";
- }
auto& eventState = getState(cookie);
if (eventState->isEventProcessingComplete) {
// TODO(b/210460522): Disallow adding new targets after eventProcessingComplete() is called.
return;
}
+ if (isDerivedCookie(cookie)) {
+ // TODO(b/210460522): Disallow adding new targets from a derived cookie.
+ return;
+ }
// TODO(b/210460522): Determine if the event is sensitive based on the target.
}