Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d3b9a7f1 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "ANDROID: Fix EventLog string class problem in... 

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

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

Change-Id: I1bc36b94f27ec90d484df3a468c1984d1ece8277
parents 65fb393b 808e0a5e

core/java/android/view/ViewRootImpl.java

+2 −2
Original line number Diff line number Diff line
@@ -8452,13 +8452,13 @@ public final class ViewRootImpl implements ViewParent, 
            MotionEvent me = (MotionEvent) event;

            if (me.getAction() == MotionEvent.ACTION_CANCEL) {

                EventLog.writeEvent(EventLogTags.VIEW_ENQUEUE_INPUT_EVENT, "Motion - Cancel",

                        getTitle());

                        getTitle().toString());

            }

        } else if (event instanceof KeyEvent) {

            KeyEvent ke = (KeyEvent) event;

            if (ke.isCanceled()) {

                EventLog.writeEvent(EventLogTags.VIEW_ENQUEUE_INPUT_EVENT, "Key - Cancel",

                        getTitle());

                        getTitle().toString());

            }

        }

        // Always enqueue the input event in order, regardless of its time stamp.