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

Commit dee9d9ab authored by John Reck's avatar John Reck Committed by Android (Google) Code Review
Browse files

Merge "Prevent updateStateTrackers from being affected by preventDefault()" into jb-dev

parents b12b6b51 387c2e8d

core/java/android/webkit/WebViewInputDispatcher.java

+1 −1
Original line number Diff line number Diff line
@@ -334,6 +334,7 @@ final class WebViewInputDispatcher { 


            DispatchEvent d = obtainDispatchEventLocked(eventToEnqueue, eventType, 0,

                    webKitXOffset, webKitYOffset, webKitScale);

            updateStateTrackersLocked(d, event);

            enqueueEventLocked(d);

        }

        return true;
@@ -787,7 +788,6 @@ final class WebViewInputDispatcher { 


                flags = d.mFlags;



                updateStateTrackersLocked(d, event);

                if (event == d.mEvent) {

                    d.mEvent = null; // retain ownership of event, don't recycle it yet

                }