From 7a08f2b716dbe310bc63bae3c2fb8212b8a7717f Mon Sep 17 00:00:00 2001
From: Dave Mankoff <mankoff@google.com>
Date: Tue, 6 Apr 2021 12:28:33 -0400
Subject: [PATCH] Ensure that FalsingManager#isFalseTap handles delayed clicks.

Views, be default, don't immediately process touch events as clicks.
Instead, they post an internal runnable to the main thread that then
runs the click. This was tripping up the FalsingManager, as a recent
change meant that it no longer saw the motion events.

With this change, the FalsingManager will look at prior events if
the recent events are empty.

Fixes: 184635871
Test: manual
Change-Id: I69981b09837d8a1d94b3a033243bce7a2d31844c
---
 .../systemui/classifier/BrightLineFalsingManager.java |  4 +++-
 .../com/android/systemui/qs/tileimpl/QSTileImpl.java  |  8 ++++----
 .../systemui/classifier/BrightLineClassifierTest.java | 11 +++++++++++
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/classifier/BrightLineFalsingManager.java b/packages/SystemUI/src/com/android/systemui/classifier/BrightLineFalsingManager.java
index 6812f77eb159f..5bdc7a4b19368 100644
--- a/packages/SystemUI/src/com/android/systemui/classifier/BrightLineFalsingManager.java
+++ b/packages/SystemUI/src/com/android/systemui/classifier/BrightLineFalsingManager.java
@@ -224,7 +224,9 @@ public class BrightLineFalsingManager implements FalsingManager {
         }
 
         FalsingClassifier.Result singleTapResult =
-                mSingleTapClassifier.isTap(mDataProvider.getRecentMotionEvents());
+                mSingleTapClassifier.isTap(mDataProvider.getRecentMotionEvents().isEmpty()
+                        ? mDataProvider.getPriorMotionEvents()
+                        : mDataProvider.getRecentMotionEvents());
         mPriorResults = Collections.singleton(singleTapResult);
 
         if (!singleTapResult.isFalse() && robustCheck) {
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileImpl.java b/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileImpl.java
index a17aebad19896..e8fc245be1235 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileImpl.java
@@ -276,7 +276,9 @@ public abstract class QSTileImpl<TState extends State> implements QSTile, Lifecy
         mUiEventLogger.logWithInstanceId(QSEvent.QS_ACTION_CLICK, 0, getMetricsSpec(),
                 getInstanceId());
         mQSLogger.logTileClick(mTileSpec, mStatusBarStateController.getState(), mState.state);
-        mHandler.sendEmptyMessage(H.CLICK);
+        if (!mFalsingManager.isFalseTap(true, 0.1)) {
+            mHandler.sendEmptyMessage(H.CLICK);
+        }
     }
 
     public void secondaryClick() {
@@ -605,9 +607,7 @@ public abstract class QSTileImpl<TState extends State> implements QSTile, Lifecy
                                 mContext, mEnforcedAdmin);
                         mActivityStarter.postStartActivityDismissingKeyguard(intent, 0);
                     } else {
-                        if (!mFalsingManager.isFalseTap(true, 0.1)) {
-                            handleClick();
-                        }
+                        handleClick();
                     }
                 } else if (msg.what == SECONDARY_CLICK) {
                     name = "handleSecondaryClick";
diff --git a/packages/SystemUI/tests/src/com/android/systemui/classifier/BrightLineClassifierTest.java b/packages/SystemUI/tests/src/com/android/systemui/classifier/BrightLineClassifierTest.java
index 1f165bba2bf7e..923cae89401d3 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/classifier/BrightLineClassifierTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/classifier/BrightLineClassifierTest.java
@@ -179,6 +179,17 @@ public class BrightLineClassifierTest extends SysuiTestCase {
         assertThat(mBrightLineFalsingManager.isFalseTap(false, 0)).isFalse();
     }
 
+    @Test
+    public void testIsFalseTap_EmptyRecentEvents() {
+        // Ensure we look at prior events if recent events has already been emptied.
+        when(mFalsingDataProvider.getRecentMotionEvents()).thenReturn(new ArrayList<>());
+        when(mFalsingDataProvider.getPriorMotionEvents()).thenReturn(mMotionEventList);
+
+        mBrightLineFalsingManager.isFalseTap(false, 0);
+        verify(mSingleTapClassfier).isTap(mMotionEventList);
+    }
+
+
     @Test
     public void testIsFalseTap_RobustCheck_NoFaceAuth() {
         when(mSingleTapClassfier.isTap(mMotionEventList)).thenReturn(mPassedResult);