Merge "Propagate finger down to KeyguardUpdateMonitor" into tm-d1-dev (13c3b1d6) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java

+20 −0

Original line number	Diff line number	Diff line
		@@ -1512,6 +1512,20 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
		handleFingerprintAuthenticated(userId, isStrongBiometric);
		};

		/**
		* Propagates a pointer down event to keyguard.
		*/
		public void onUdfpsPointerDown(int sensorId) {
		mFingerprintAuthenticationCallback.onUdfpsPointerDown(sensorId);
		}

		/**
		* Propagates a pointer up event to keyguard.
		*/
		public void onUdfpsPointerUp(int sensorId) {
		mFingerprintAuthenticationCallback.onUdfpsPointerUp(sensorId);
		}

		@VisibleForTesting
		final FingerprintManager.AuthenticationCallback mFingerprintAuthenticationCallback
		= new AuthenticationCallback() {
		@@ -1553,6 +1567,9 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
		Trace.endSection();
		}

		/**
		* Note, this is currently called from UdfpsController.
		*/
		@Override
		public void onUdfpsPointerDown(int sensorId) {
		Log.d(TAG, "onUdfpsPointerDown, sensorId: " + sensorId);
		@@ -1562,6 +1579,9 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
		}
		}

		/**
		* Note, this is currently called from UdfpsController.
		*/
		@Override
		public void onUdfpsPointerUp(int sensorId) {
		Log.d(TAG, "onUdfpsPointerUp, sensorId: " + sensorId);

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

+10 −0

Original line number	Diff line number	Diff line
		@@ -796,6 +796,11 @@ public class UdfpsController implements DozeReceiver {
		mOnFingerDown = true;
		if (mAlternateTouchProvider != null) {
		mAlternateTouchProvider.onPointerDown(requestId, x, y, minor, major);
		mFgExecutor.execute(() -> {
		if (mKeyguardUpdateMonitor.isFingerprintDetectionRunning()) {
		mKeyguardUpdateMonitor.onUdfpsPointerDown((int) requestId);
		}
		});
		} else {
		mFingerprintManager.onPointerDown(requestId, mSensorId, x, y, minor, major);
		}
		@@ -821,6 +826,11 @@ public class UdfpsController implements DozeReceiver {
		if (mOnFingerDown) {
		if (mAlternateTouchProvider != null) {
		mAlternateTouchProvider.onPointerUp(requestId);
		mFgExecutor.execute(() -> {
		if (mKeyguardUpdateMonitor.isFingerprintDetectionRunning()) {
		mKeyguardUpdateMonitor.onUdfpsPointerUp((int) requestId);
		}
		});
		} else {
		mFingerprintManager.onPointerUp(requestId, mSensorId);
		}

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

+6 −0

Original line number	Diff line number	Diff line
		@@ -564,6 +564,7 @@ public class UdfpsControllerTest extends SysuiTestCase {
		// Configure UdfpsView to accept the ACTION_DOWN event
		when(mUdfpsView.isIlluminationRequested()).thenReturn(false);
		when(mUdfpsView.isWithinSensorArea(anyFloat(), anyFloat())).thenReturn(true);
		when(mKeyguardUpdateMonitor.isFingerprintDetectionRunning()).thenReturn(true);

		// GIVEN that the overlay is showing
		mOverlayController.showUdfpsOverlay(TEST_REQUEST_ID, TEST_UDFPS_SENSOR_ID,
		@@ -579,6 +580,7 @@ public class UdfpsControllerTest extends SysuiTestCase {
		// FIX THIS TEST
		mTouchListenerCaptor.getValue().onTouch(mUdfpsView, moveEvent);
		moveEvent.recycle();
		mFgExecutor.runAllReady();
		// THEN FingerprintManager is notified about onPointerDown
		verify(mAlternateTouchProvider).onPointerDown(eq(TEST_REQUEST_ID), eq(0), eq(0), eq(0f),
		eq(0f));
		@@ -588,6 +590,7 @@ public class UdfpsControllerTest extends SysuiTestCase {
		// AND illumination begins
		verify(mUdfpsView).startIllumination(mOnIlluminatedRunnableCaptor.capture());
		verify(mLatencyTracker, never()).onActionEnd(eq(LatencyTracker.ACTION_UDFPS_ILLUMINATE));
		verify(mKeyguardUpdateMonitor).onUdfpsPointerDown(eq((int) TEST_REQUEST_ID));
		// AND onIlluminatedRunnable notifies FingerprintManager about onUiReady
		mOnIlluminatedRunnableCaptor.getValue().run();
		InOrder inOrder = inOrder(mFingerprintManager, mLatencyTracker);
		@@ -606,6 +609,7 @@ public class UdfpsControllerTest extends SysuiTestCase {
		when(mKeyguardUpdateMonitor.isFingerprintDetectionRunning()).thenReturn(true);
		// WHEN fingerprint is requested because of AOD interrupt
		mUdfpsController.onAodInterrupt(0, 0, 2f, 3f);
		mFgExecutor.runAllReady();
		// THEN illumination begins
		// AND onIlluminatedRunnable that notifies FingerprintManager is set
		verify(mUdfpsView).startIllumination(mOnIlluminatedRunnableCaptor.capture());
		@@ -614,6 +618,7 @@ public class UdfpsControllerTest extends SysuiTestCase {
		eq(0), eq(0), eq(3f) /* minor /, eq(2f) / major */);
		verify(mFingerprintManager, never()).onPointerDown(anyLong(), anyInt(), anyInt(), anyInt(),
		anyFloat(), anyFloat());
		verify(mKeyguardUpdateMonitor).onUdfpsPointerDown(eq((int) TEST_REQUEST_ID));
		}

		@Test
		@@ -641,6 +646,7 @@ public class UdfpsControllerTest extends SysuiTestCase {
		mFgExecutor.runAllReady();
		when(mKeyguardUpdateMonitor.isFingerprintDetectionRunning()).thenReturn(true);
		mUdfpsController.onAodInterrupt(0, 0, 0f, 0f);
		mFgExecutor.runAllReady();
		when(mUdfpsView.isIlluminationRequested()).thenReturn(true);
		// WHEN it times out
		mFgExecutor.advanceClockToNext();