Merge "Inform the falsing manager about UDFPS touches on down" into udc-qpr-dev (3b3accd7) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java

+7 −1

Original line number	Diff line number	Diff line
		@@ -595,6 +595,13 @@ public class UdfpsController implements DozeReceiver, Dumpable {

		// Pilfer if valid overlap, don't allow following events to reach keyguard
		shouldPilfer = true;

		// Touch is a valid UDFPS touch. Inform the falsing manager so that the touch
		// isn't counted against the falsing algorithm as an accidental touch.
		// We do this on the DOWN event instead of CANCEL/UP because the CANCEL/UP events
		// get sent too late to this receiver (after the actual cancel/up motions occur),
		// and therefore wouldn't end up being used as part of the falsing algo.
		mFalsingManager.isFalseTouch(UDFPS_AUTHENTICATION);
		break;

		case UP:
		@@ -614,7 +621,6 @@ public class UdfpsController implements DozeReceiver, Dumpable {
		data.getTime(),
		data.getGestureStart(),
		mStatusBarStateController.isDozing());
		mFalsingManager.isFalseTouch(UDFPS_AUTHENTICATION);
		break;

		case UNCHANGED:

packages/SystemUI/tests/src/com/android/systemui/biometrics/UdfpsControllerTest.java

+48 −21

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@ import static android.view.MotionEvent.ACTION_MOVE;
		import static android.view.MotionEvent.ACTION_UP;

		import static com.android.internal.util.FunctionalUtils.ThrowingConsumer;
		import static com.android.systemui.classifier.Classifier.UDFPS_AUTHENTICATION;

		import static junit.framework.Assert.assertEquals;
		import static junit.framework.Assert.assertFalse;
		@@ -59,6 +60,7 @@ import android.os.PowerManager;
		import android.os.RemoteException;
		import android.os.VibrationAttributes;
		import android.testing.TestableLooper.RunWithLooper;
		import android.util.Pair;
		import android.view.LayoutInflater;
		import android.view.MotionEvent;
		import android.view.Surface;
		@@ -1202,9 +1204,54 @@ public class UdfpsControllerTest extends SysuiTestCase {
		verify(mFingerprintManager).onPointerUp(anyLong(), anyInt());
		}

		@Test
		public void fingerDown_falsingManagerInformed() throws RemoteException {
		final Pair<TouchProcessorResult, TouchProcessorResult> touchProcessorResult =
		givenAcceptFingerDownEvent();

		// WHEN ACTION_DOWN is received
		when(mSinglePointerTouchProcessor.processTouch(any(), anyInt(), any())).thenReturn(
		touchProcessorResult.first);
		MotionEvent downEvent = MotionEvent.obtain(0, 0, ACTION_DOWN, 0, 0, 0);
		mTouchListenerCaptor.getValue().onTouch(mUdfpsView, downEvent);
		mBiometricExecutor.runAllReady();
		downEvent.recycle();

		// THEN falsing manager is informed of the touch
		verify(mFalsingManager).isFalseTouch(UDFPS_AUTHENTICATION);
		}

		@Test
		public void onTouch_withNewTouchDetection_shouldCallNewFingerprintManagerPath()
		throws RemoteException {
		final Pair<TouchProcessorResult, TouchProcessorResult> processorResultDownAndUp =
		givenAcceptFingerDownEvent();

		// WHEN ACTION_DOWN is received
		when(mSinglePointerTouchProcessor.processTouch(any(), anyInt(), any())).thenReturn(
		processorResultDownAndUp.first);
		MotionEvent downEvent = MotionEvent.obtain(0, 0, ACTION_DOWN, 0, 0, 0);
		mTouchListenerCaptor.getValue().onTouch(mUdfpsView, downEvent);
		mBiometricExecutor.runAllReady();
		downEvent.recycle();

		// AND ACTION_UP is received
		when(mSinglePointerTouchProcessor.processTouch(any(), anyInt(), any())).thenReturn(
		processorResultDownAndUp.second);
		MotionEvent upEvent = MotionEvent.obtain(0, 0, MotionEvent.ACTION_UP, 0, 0, 0);
		mTouchListenerCaptor.getValue().onTouch(mUdfpsView, upEvent);
		mBiometricExecutor.runAllReady();
		upEvent.recycle();

		// THEN the new FingerprintManager path is invoked.
		verify(mFingerprintManager).onPointerDown(anyLong(), anyInt(), anyInt(), anyFloat(),
		anyFloat(), anyFloat(), anyFloat(), anyFloat(), anyLong(), anyLong(), anyBoolean());
		verify(mFingerprintManager).onPointerUp(anyLong(), anyInt(), anyInt(), anyFloat(),
		anyFloat(), anyFloat(), anyFloat(), anyFloat(), anyLong(), anyLong(), anyBoolean());
		}

		private Pair<TouchProcessorResult, TouchProcessorResult> givenAcceptFingerDownEvent()
		throws RemoteException {
		final NormalizedTouchData touchData = new NormalizedTouchData(0, 0f, 0f, 0f, 0f, 0f, 0L,
		0L);
		final TouchProcessorResult processorResultDown = new TouchProcessorResult.ProcessedTouch(
		@@ -1230,27 +1277,7 @@ public class UdfpsControllerTest extends SysuiTestCase {

		verify(mUdfpsView).setOnTouchListener(mTouchListenerCaptor.capture());

		// WHEN ACTION_DOWN is received
		when(mSinglePointerTouchProcessor.processTouch(any(), anyInt(), any())).thenReturn(
		processorResultDown);
		MotionEvent downEvent = MotionEvent.obtain(0, 0, ACTION_DOWN, 0, 0, 0);
		mTouchListenerCaptor.getValue().onTouch(mUdfpsView, downEvent);
		mBiometricExecutor.runAllReady();
		downEvent.recycle();

		// AND ACTION_UP is received
		when(mSinglePointerTouchProcessor.processTouch(any(), anyInt(), any())).thenReturn(
		processorResultUp);
		MotionEvent upEvent = MotionEvent.obtain(0, 0, MotionEvent.ACTION_UP, 0, 0, 0);
		mTouchListenerCaptor.getValue().onTouch(mUdfpsView, upEvent);
		mBiometricExecutor.runAllReady();
		upEvent.recycle();

		// THEN the new FingerprintManager path is invoked.
		verify(mFingerprintManager).onPointerDown(anyLong(), anyInt(), anyInt(), anyFloat(),
		anyFloat(), anyFloat(), anyFloat(), anyFloat(), anyLong(), anyLong(), anyBoolean());
		verify(mFingerprintManager).onPointerUp(anyLong(), anyInt(), anyInt(), anyFloat(),
		anyFloat(), anyFloat(), anyFloat(), anyFloat(), anyLong(), anyLong(), anyBoolean());
		return new Pair<>(processorResultDown, processorResultUp);
		}

		@Test