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

Commit 2719639c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix unbounded MotionEvent growth in Falsing" into sc-dev am: ebf45791 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifac3c1ac0fe4ff3317797f1ef8c3e9f9fdeedbda
parents e7210fa1 ebf45791

packages/SystemUI/src/com/android/systemui/classifier/DoubleTapClassifier.java

+1 −3
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ import static com.android.systemui.classifier.FalsingModule.DOUBLE_TAP_TOUCH_SLO 
import android.view.MotionEvent;



import java.util.List;

import java.util.Queue;



import javax.inject.Inject;

import javax.inject.Named;
@@ -49,8 +48,7 @@ public class DoubleTapClassifier extends FalsingClassifier { 
    @Override

    Result calculateFalsingResult(double historyPenalty, double historyConfidence) {

        List<MotionEvent> secondTapEvents = getRecentMotionEvents();

        Queue<? extends List<MotionEvent>> historicalEvents = getHistoricalEvents();

        List<MotionEvent> firstTapEvents = historicalEvents.peek();

        List<MotionEvent> firstTapEvents = getPriorMotionEvents();



        StringBuilder reason = new StringBuilder();

packages/SystemUI/src/com/android/systemui/classifier/FalsingClassifier.java

+2 −3
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ import android.view.MotionEvent; 
import com.android.systemui.util.sensors.ProximitySensor;



import java.util.List;

import java.util.Queue;



/**

 * Base class for rules that determine False touches.
@@ -40,8 +39,8 @@ public abstract class FalsingClassifier { 
        return mDataProvider.getRecentMotionEvents();

    }



    Queue<? extends List<MotionEvent>> getHistoricalEvents() {

        return mDataProvider.getHistoricalMotionEvents();

    List<MotionEvent> getPriorMotionEvents() {

        return mDataProvider.getPriorMotionEvents();

    }



    MotionEvent getFirstMotionEvent() {

packages/SystemUI/src/com/android/systemui/classifier/FalsingDataProvider.java

+10 −23
Original line number Diff line number Diff line
@@ -23,13 +23,9 @@ import android.view.MotionEvent.PointerProperties; 


import com.android.systemui.dagger.SysUISingleton;

import com.android.systemui.statusbar.policy.BatteryController;

import com.android.systemui.util.time.SystemClock;



import java.util.ArrayList;

import java.util.Deque;

import java.util.LinkedList;

import java.util.List;

import java.util.Queue;



import javax.inject.Inject;
@@ -40,24 +36,23 @@ import javax.inject.Inject; 
public class FalsingDataProvider {



    private static final long MOTION_EVENT_AGE_MS = 1000;

    private static final long EXTENDED_MOTION_EVENT_AGE_MS = 30 * 1000;

    private static final float THREE_HUNDRED_SIXTY_DEG = (float) (2 * Math.PI);



    private final int mWidthPixels;

    private final int mHeightPixels;

    private final BatteryController mBatteryController;

    private final SystemClock mSystemClock;

    private final float mXdpi;

    private final float mYdpi;

    private final List<SessionListener> mSessionListeners = new ArrayList<>();

    private final List<MotionEventListener> mMotionEventListeners = new ArrayList<>();

    private final List<GestureCompleteListener> mGestuerCompleteListeners = new ArrayList<>();

    private final List<GestureCompleteListener> mGestureCompleteListeners = new ArrayList<>();



    private @Classifier.InteractionType int mInteractionType;

    private final Deque<TimeLimitedMotionEventBuffer> mExtendedMotionEvents = new LinkedList<>();



    private TimeLimitedMotionEventBuffer mRecentMotionEvents =

            new TimeLimitedMotionEventBuffer(MOTION_EVENT_AGE_MS);

    private List<MotionEvent> mPriorMotionEvents;



    private boolean mDirty = true;



    private float mAngle = 0;
@@ -66,14 +61,12 @@ public class FalsingDataProvider { 
    private boolean mJustUnlockedWithFace;



    @Inject

    public FalsingDataProvider(DisplayMetrics displayMetrics, BatteryController batteryController,

            SystemClock systemClock) {

    public FalsingDataProvider(DisplayMetrics displayMetrics, BatteryController batteryController) {

        mXdpi = displayMetrics.xdpi;

        mYdpi = displayMetrics.ydpi;

        mWidthPixels = displayMetrics.widthPixels;

        mHeightPixels = displayMetrics.heightPixels;

        mBatteryController = batteryController;

        mSystemClock = systemClock;



        FalsingClassifier.logInfo("xdpi, ydpi: " + getXdpi() + ", " + getYdpi());

        FalsingClassifier.logInfo("width, height: " + getWidthPixels() + ", " + getHeightPixels());
@@ -111,10 +104,10 @@ public class FalsingDataProvider { 


    private void completePriorGesture() {

        if (!mRecentMotionEvents.isEmpty()) {

            mGestuerCompleteListeners.forEach(listener -> listener.onGestureComplete(

            mGestureCompleteListeners.forEach(listener -> listener.onGestureComplete(

                    mRecentMotionEvents.get(mRecentMotionEvents.size() - 1).getEventTime()));



            mExtendedMotionEvents.addFirst(mRecentMotionEvents);

            mPriorMotionEvents = mRecentMotionEvents;

        }

    }
@@ -140,14 +133,8 @@ public class FalsingDataProvider { 
        return mRecentMotionEvents;

    }



    /** Returns recent gestures, exclusive of the most recent gesture. Newer gestures come first. */

    public Queue<? extends List<MotionEvent>> getHistoricalMotionEvents() {

        long nowMs = mSystemClock.uptimeMillis();



        mExtendedMotionEvents.removeIf(

                motionEvents -> motionEvents.isFullyExpired(nowMs - EXTENDED_MOTION_EVENT_AGE_MS));



        return mExtendedMotionEvents;

    public List<MotionEvent> getPriorMotionEvents() {

        return mPriorMotionEvents;

    }



    /**
@@ -344,12 +331,12 @@ public class FalsingDataProvider { 


    /** Register a {@link GestureCompleteListener}. */

    public void addGestureCompleteListener(GestureCompleteListener listener) {

        mGestuerCompleteListeners.add(listener);

        mGestureCompleteListeners.add(listener);

    }



    /** Unregister a {@link GestureCompleteListener}. */

    public void removeGestureCompleteListener(GestureCompleteListener listener) {

        mGestuerCompleteListeners.remove(listener);

        mGestureCompleteListeners.remove(listener);

    }



    void onSessionStarted() {

packages/SystemUI/src/com/android/systemui/classifier/TimeLimitedMotionEventBuffer.java

+0 −12
Original line number Diff line number Diff line
@@ -42,18 +42,6 @@ public class TimeLimitedMotionEventBuffer implements List<MotionEvent> { 
        mMotionEvents = new LinkedList<>();

    }



    /**

     * Returns true if the most recent event in the buffer is past the expiration time.

     *

     * This method does not mutate the underlying data. This method does imply that, if the supplied

     * expiration time is old enough and a new {@link MotionEvent} gets added to the buffer, all

     * prior events would be removed.

     */

    public boolean isFullyExpired(long expirationMs) {

        return mMotionEvents.isEmpty()

                || mMotionEvents.getLast().getEventTime() <= expirationMs;

    }



    private void ejectOldEvents() {

        if (mMotionEvents.isEmpty()) {

            return;

packages/SystemUI/tests/src/com/android/systemui/classifier/ClassifierTest.java

+1 −3
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ import static com.android.systemui.classifier.Classifier.UNLOCK; 
import android.util.DisplayMetrics;

import android.view.MotionEvent;



import com.android.systemui.util.time.FakeSystemClock;

import com.android.systemui.utils.leaks.FakeBatteryController;

import com.android.systemui.utils.leaks.LeakCheckedTest;
@@ -45,8 +44,7 @@ public class ClassifierTest extends LeakCheckedTest { 
        displayMetrics.widthPixels = 1000;

        displayMetrics.heightPixels = 1000;

        mFakeBatteryController = new FakeBatteryController(getLeakCheck());

        mDataProvider = new FalsingDataProvider(displayMetrics, mFakeBatteryController,

                new FakeSystemClock());

        mDataProvider = new FalsingDataProvider(displayMetrics, mFakeBatteryController);

        mDataProvider.setInteractionType(UNLOCK);

    }