Merge "ANDROID: Fix EventLog string class problem in ViewRootImpl#enqueueInputEvent()" am: 808e0a5e7a

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1909899

Change-Id: I1bc36b94f27ec90d484df3a468c1984d1ece8277
This commit is contained in:
Treehugger Robot
2021-12-03 22:21:12 +00:00
committed by Automerger Merge Worker

View File

@@ -8452,13 +8452,13 @@ public final class ViewRootImpl implements ViewParent,
MotionEvent me = (MotionEvent) event; MotionEvent me = (MotionEvent) event;
if (me.getAction() == MotionEvent.ACTION_CANCEL) { if (me.getAction() == MotionEvent.ACTION_CANCEL) {
EventLog.writeEvent(EventLogTags.VIEW_ENQUEUE_INPUT_EVENT, "Motion - Cancel", EventLog.writeEvent(EventLogTags.VIEW_ENQUEUE_INPUT_EVENT, "Motion - Cancel",
getTitle()); getTitle().toString());
} }
} else if (event instanceof KeyEvent) { } else if (event instanceof KeyEvent) {
KeyEvent ke = (KeyEvent) event; KeyEvent ke = (KeyEvent) event;
if (ke.isCanceled()) { if (ke.isCanceled()) {
EventLog.writeEvent(EventLogTags.VIEW_ENQUEUE_INPUT_EVENT, "Key - Cancel", EventLog.writeEvent(EventLogTags.VIEW_ENQUEUE_INPUT_EVENT, "Key - Cancel",
getTitle()); getTitle().toString());
} }
} }
// Always enqueue the input event in order, regardless of its time stamp. // Always enqueue the input event in order, regardless of its time stamp.