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

Commit ae25fa31 authored by Zach Kuznia's avatar Zach Kuznia Committed by Android (Google) Code Review
Browse files

Merge "Remove change to event time when sending delayed events in ScreenMagnifier."

parents f5c87d81 f5ee31d6

services/accessibility/java/com/android/server/accessibility/ScreenMagnifier.java

+2 −27
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ import android.os.AsyncTask; 
import android.os.Binder;

import android.os.Handler;

import android.os.Message;

import android.os.SystemClock;

import android.provider.Settings;

import android.text.TextUtils;

import android.util.Property;
@@ -817,33 +816,12 @@ public final class ScreenMagnifier implements WindowManagerInternal.Magnificatio 
            while (mDelayedEventQueue != null) {

                MotionEventInfo info = mDelayedEventQueue;

                mDelayedEventQueue = info.mNext;

                final long offset = SystemClock.uptimeMillis() - info.mCachedTimeMillis;

                MotionEvent event = obtainEventWithOffsetTimeAndDownTime(info.mEvent, offset);

                MotionEvent rawEvent = obtainEventWithOffsetTimeAndDownTime(info.mRawEvent, offset);

                ScreenMagnifier.this.onMotionEvent(event, rawEvent, info.mPolicyFlags);

                event.recycle();

                rawEvent.recycle();

                ScreenMagnifier.this.onMotionEvent(info.mEvent, info.mRawEvent,

                        info.mPolicyFlags);

                info.recycle();

            }

        }



        private MotionEvent obtainEventWithOffsetTimeAndDownTime(MotionEvent event, long offset) {

            final int pointerCount = event.getPointerCount();

            PointerCoords[] coords = getTempPointerCoordsWithMinSize(pointerCount);

            PointerProperties[] properties = getTempPointerPropertiesWithMinSize(pointerCount);

            for (int i = 0; i < pointerCount; i++) {

                event.getPointerCoords(i, coords[i]);

                event.getPointerProperties(i, properties[i]);

            }

            final long downTime = event.getDownTime() + offset;

            final long eventTime = event.getEventTime() + offset;

            return MotionEvent.obtain(downTime, eventTime,

                    event.getAction(), pointerCount, properties, coords,

                    event.getMetaState(), event.getButtonState(),

                    1.0f, 1.0f, event.getDeviceId(), event.getEdgeFlags(),

                    event.getSource(), event.getFlags());

        }



        private void clearDelayedMotionEvents() {

            while (mDelayedEventQueue != null) {

                MotionEventInfo info = mDelayedEventQueue;
@@ -919,7 +897,6 @@ public final class ScreenMagnifier implements WindowManagerInternal.Magnificatio 
        public MotionEvent mEvent;

        public MotionEvent mRawEvent;

        public int mPolicyFlags;

        public long mCachedTimeMillis;



        public static MotionEventInfo obtain(MotionEvent event, MotionEvent rawEvent,

                int policyFlags) {
@@ -944,7 +921,6 @@ public final class ScreenMagnifier implements WindowManagerInternal.Magnificatio 
            mEvent = MotionEvent.obtain(event);

            mRawEvent = MotionEvent.obtain(rawEvent);

            mPolicyFlags = policyFlags;

            mCachedTimeMillis = SystemClock.uptimeMillis();

        }



        public void recycle() {
@@ -968,7 +944,6 @@ public final class ScreenMagnifier implements WindowManagerInternal.Magnificatio 
            mRawEvent.recycle();

            mRawEvent = null;

            mPolicyFlags = 0;

            mCachedTimeMillis = 0;

        }

    }