Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add tests for the FingerprintManager path in UdfpsController am: 2e38249906

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

Change-Id: I959d77ff5f343c8abbcf7c0176a61e9849f2e6d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Ilya Matyukhin
2022-11-11 09:23:29 +00:00
committed by Automerger Merge Worker
parent 1aeb4c8ec1 2e38249906
commit 84dea87491
1 changed files with 179 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -114,10 +114,8 @@ public class UdfpsControllerTest extends SysuiTestCase {
@Rule @Rule
public MockitoRule rule = MockitoJUnit.rule(); public MockitoRule rule = MockitoJUnit.rule();
// Unit under test // Unit under test
private UdfpsController mUdfpsController; private UdfpsController mUdfpsController;
// Dependencies // Dependencies
private FakeExecutor mBiometricsExecutor; private FakeExecutor mBiometricsExecutor;
@Mock @Mock
@@ -171,7 +169,6 @@ public class UdfpsControllerTest extends SysuiTestCase {
private UdfpsDisplayMode mUdfpsDisplayMode; private UdfpsDisplayMode mUdfpsDisplayMode;
@Mock @Mock
private FeatureFlags mFeatureFlags; private FeatureFlags mFeatureFlags;
// Stuff for configuring mocks // Stuff for configuring mocks
@Mock @Mock
private UdfpsView mUdfpsView; private UdfpsView mUdfpsView;
@@ -249,54 +246,42 @@ public class UdfpsControllerTest extends SysuiTestCase {
FingerprintSensorProperties.TYPE_UDFPS_ULTRASONIC, FingerprintSensorProperties.TYPE_UDFPS_ULTRASONIC,
true /* resetLockoutRequiresHardwareAuthToken */); true /* resetLockoutRequiresHardwareAuthToken */);
List<FingerprintSensorPropertiesInternal> props = new ArrayList<>();
props.add(mOpticalProps);
props.add(mUltrasonicProps);
when(mFingerprintManager.getSensorPropertiesInternal()).thenReturn(props);
mFgExecutor = new FakeExecutor(new FakeSystemClock()); mFgExecutor = new FakeExecutor(new FakeSystemClock());
// Create a fake background executor. // Create a fake background executor.
mBiometricsExecutor = new FakeExecutor(new FakeSystemClock()); mBiometricsExecutor = new FakeExecutor(new FakeSystemClock());
mUdfpsController = new UdfpsController( initUdfpsController(true /* hasAlternateTouchProvider */);
mContext, }
execution,
mLayoutInflater, private void initUdfpsController(boolean hasAlternateTouchProvider) {
mFingerprintManager, initUdfpsController(mOpticalProps, hasAlternateTouchProvider);
mWindowManager, }
mStatusBarStateController,
mFgExecutor, private void initUdfpsController(FingerprintSensorPropertiesInternal sensorProps,
new ShadeExpansionStateManager(), boolean hasAlternateTouchProvider) {
mStatusBarKeyguardViewManager, reset(mFingerprintManager);
mDumpManager, reset(mScreenLifecycle);
mKeyguardUpdateMonitor,
mFeatureFlags, final Optional<AlternateUdfpsTouchProvider> alternateTouchProvider =
mFalsingManager, hasAlternateTouchProvider ? Optional.of(mAlternateTouchProvider) : Optional.empty();
mPowerManager,
mAccessibilityManager, mUdfpsController = new UdfpsController(mContext, new FakeExecution(), mLayoutInflater,
mLockscreenShadeTransitionController, mFingerprintManager, mWindowManager, mStatusBarStateController, mFgExecutor,
mScreenLifecycle, new ShadeExpansionStateManager(), mStatusBarKeyguardViewManager, mDumpManager,
mVibrator, mKeyguardUpdateMonitor, mFeatureFlags, mFalsingManager, mPowerManager,
mUdfpsHapticsSimulator, mAccessibilityManager, mLockscreenShadeTransitionController, mScreenLifecycle,
mUdfpsShell, mVibrator, mUdfpsHapticsSimulator, mUdfpsShell, mKeyguardStateController,
mKeyguardStateController, mDisplayManager, mHandler, mConfigurationController, mSystemClock,
mDisplayManager, mUnlockedScreenOffAnimationController, mSystemUIDialogManager, mLatencyTracker,
mHandler, mActivityLaunchAnimator, alternateTouchProvider, mBiometricsExecutor,
mConfigurationController,
mSystemClock,
mUnlockedScreenOffAnimationController,
mSystemUIDialogManager,
mLatencyTracker,
mActivityLaunchAnimator,
Optional.of(mAlternateTouchProvider),
mBiometricsExecutor,
mPrimaryBouncerInteractor); mPrimaryBouncerInteractor);
verify(mFingerprintManager).setUdfpsOverlayController(mOverlayCaptor.capture()); verify(mFingerprintManager).setUdfpsOverlayController(mOverlayCaptor.capture());
mOverlayController = mOverlayCaptor.getValue(); mOverlayController = mOverlayCaptor.getValue();
verify(mScreenLifecycle).addObserver(mScreenObserverCaptor.capture()); verify(mScreenLifecycle).addObserver(mScreenObserverCaptor.capture());
mScreenObserver = mScreenObserverCaptor.getValue(); mScreenObserver = mScreenObserverCaptor.getValue();
mUdfpsController.updateOverlayParams(mOpticalProps, new UdfpsOverlayParams());
mUdfpsController.updateOverlayParams(sensorProps, new UdfpsOverlayParams());
mUdfpsController.setUdfpsDisplayMode(mUdfpsDisplayMode); mUdfpsController.setUdfpsDisplayMode(mUdfpsDisplayMode);
} }
@@ -333,8 +318,7 @@ public class UdfpsControllerTest extends SysuiTestCase {
} }
@Test @Test
public void onActionMoveTouch_whenCanDismissLockScreen_entersDevice() public void onActionMoveTouch_whenCanDismissLockScreen_entersDevice() throws RemoteException {
throws RemoteException {
onActionMoveTouch_whenCanDismissLockScreen_entersDevice(false /* stale */); onActionMoveTouch_whenCanDismissLockScreen_entersDevice(false /* stale */);
} }
@@ -521,8 +505,37 @@ public class UdfpsControllerTest extends SysuiTestCase {
new MotionEvent.PointerCoords[]{pc}, 0, 0, 1f, 1f, 0, 0, 0, 0); new MotionEvent.PointerCoords[]{pc}, 0, 0, 1f, 1f, 0, 0, 0, 0);
} }
private static class TestParams {
public final FingerprintSensorPropertiesInternal sensorProps;
public final boolean hasAlternateTouchProvider;
TestParams(FingerprintSensorPropertiesInternal sensorProps,
boolean hasAlternateTouchProvider) {
this.sensorProps = sensorProps;
this.hasAlternateTouchProvider = hasAlternateTouchProvider;
}
}
private void runWithAllParams(ThrowingConsumer<TestParams> testParamsConsumer) {
for (FingerprintSensorPropertiesInternal sensorProps : List.of(mOpticalProps,
mUltrasonicProps)) {
for (boolean hasAlternateTouchProvider : new boolean[]{false, true}) {
initUdfpsController(sensorProps, hasAlternateTouchProvider);
testParamsConsumer.accept(new TestParams(sensorProps, hasAlternateTouchProvider));
}
}
}
@Test @Test
public void onTouch_propagatesTouchInNativeOrientationAndResolution() throws RemoteException { public void onTouch_propagatesTouchInNativeOrientationAndResolution() {
runWithAllParams(
this::onTouch_propagatesTouchInNativeOrientationAndResolutionParameterized);
}
private void onTouch_propagatesTouchInNativeOrientationAndResolutionParameterized(
TestParams testParams) throws RemoteException {
reset(mUdfpsView);
final Rect sensorBounds = new Rect(1000, 1900, 1080, 1920); // Bottom right corner. final Rect sensorBounds = new Rect(1000, 1900, 1080, 1920); // Bottom right corner.
final int displayWidth = 1080; final int displayWidth = 1080;
final int displayHeight = 1920; final int displayHeight = 1920;
@@ -541,13 +554,13 @@ public class UdfpsControllerTest extends SysuiTestCase {
when(mUdfpsView.isWithinSensorArea(anyFloat(), anyFloat())).thenReturn(true); when(mUdfpsView.isWithinSensorArea(anyFloat(), anyFloat())).thenReturn(true);
// Show the overlay. // Show the overlay.
mOverlayController.showUdfpsOverlay(TEST_REQUEST_ID, mOpticalProps.sensorId, mOverlayController.showUdfpsOverlay(TEST_REQUEST_ID, testParams.sensorProps.sensorId,
BiometricOverlayConstants.REASON_ENROLL_ENROLLING, mUdfpsOverlayControllerCallback); BiometricOverlayConstants.REASON_ENROLL_ENROLLING, mUdfpsOverlayControllerCallback);
mFgExecutor.runAllReady(); mFgExecutor.runAllReady();
verify(mUdfpsView).setOnTouchListener(mTouchListenerCaptor.capture()); verify(mUdfpsView).setOnTouchListener(mTouchListenerCaptor.capture());
// Test ROTATION_0 // Test ROTATION_0
mUdfpsController.updateOverlayParams(mOpticalProps, mUdfpsController.updateOverlayParams(testParams.sensorProps,
new UdfpsOverlayParams(sensorBounds, sensorBounds, displayWidth, displayHeight, new UdfpsOverlayParams(sensorBounds, sensorBounds, displayWidth, displayHeight,
scaleFactor, Surface.ROTATION_0)); scaleFactor, Surface.ROTATION_0));
MotionEvent event = obtainMotionEvent(ACTION_DOWN, displayWidth, displayHeight, touchMinor, MotionEvent event = obtainMotionEvent(ACTION_DOWN, displayWidth, displayHeight, touchMinor,
@@ -559,12 +572,19 @@ public class UdfpsControllerTest extends SysuiTestCase {
mTouchListenerCaptor.getValue().onTouch(mUdfpsView, event); mTouchListenerCaptor.getValue().onTouch(mUdfpsView, event);
mBiometricsExecutor.runAllReady(); mBiometricsExecutor.runAllReady();
event.recycle(); event.recycle();
if (testParams.hasAlternateTouchProvider) {
verify(mAlternateTouchProvider).onPointerDown(eq(TEST_REQUEST_ID), eq(expectedX), verify(mAlternateTouchProvider).onPointerDown(eq(TEST_REQUEST_ID), eq(expectedX),
eq(expectedY), eq(expectedMinor), eq(expectedMajor)); eq(expectedY), eq(expectedMinor), eq(expectedMajor));
} else {
verify(mFingerprintManager).onPointerDown(eq(TEST_REQUEST_ID),
eq(testParams.sensorProps.sensorId), eq(expectedX), eq(expectedY),
eq(expectedMinor), eq(expectedMajor));
}
// Test ROTATION_90 // Test ROTATION_90
reset(mAlternateTouchProvider); reset(mAlternateTouchProvider);
mUdfpsController.updateOverlayParams(mOpticalProps, reset(mFingerprintManager);
mUdfpsController.updateOverlayParams(testParams.sensorProps,
new UdfpsOverlayParams(sensorBounds, sensorBounds, displayWidth, displayHeight, new UdfpsOverlayParams(sensorBounds, sensorBounds, displayWidth, displayHeight,
scaleFactor, Surface.ROTATION_90)); scaleFactor, Surface.ROTATION_90));
event = obtainMotionEvent(ACTION_DOWN, displayHeight, 0, touchMinor, touchMajor); event = obtainMotionEvent(ACTION_DOWN, displayHeight, 0, touchMinor, touchMajor);
@@ -575,12 +595,19 @@ public class UdfpsControllerTest extends SysuiTestCase {
mTouchListenerCaptor.getValue().onTouch(mUdfpsView, event); mTouchListenerCaptor.getValue().onTouch(mUdfpsView, event);
mBiometricsExecutor.runAllReady(); mBiometricsExecutor.runAllReady();
event.recycle(); event.recycle();
if (testParams.hasAlternateTouchProvider) {
verify(mAlternateTouchProvider).onPointerDown(eq(TEST_REQUEST_ID), eq(expectedX), verify(mAlternateTouchProvider).onPointerDown(eq(TEST_REQUEST_ID), eq(expectedX),
eq(expectedY), eq(expectedMinor), eq(expectedMajor)); eq(expectedY), eq(expectedMinor), eq(expectedMajor));
} else {
verify(mFingerprintManager).onPointerDown(eq(TEST_REQUEST_ID),
eq(testParams.sensorProps.sensorId), eq(expectedX), eq(expectedY),
eq(expectedMinor), eq(expectedMajor));
}
// Test ROTATION_270 // Test ROTATION_270
reset(mAlternateTouchProvider); reset(mAlternateTouchProvider);
mUdfpsController.updateOverlayParams(mOpticalProps, reset(mFingerprintManager);
mUdfpsController.updateOverlayParams(testParams.sensorProps,
new UdfpsOverlayParams(sensorBounds, sensorBounds, displayWidth, displayHeight, new UdfpsOverlayParams(sensorBounds, sensorBounds, displayWidth, displayHeight,
scaleFactor, Surface.ROTATION_270)); scaleFactor, Surface.ROTATION_270));
event = obtainMotionEvent(ACTION_DOWN, 0, displayWidth, touchMinor, touchMajor); event = obtainMotionEvent(ACTION_DOWN, 0, displayWidth, touchMinor, touchMajor);
@@ -591,12 +618,19 @@ public class UdfpsControllerTest extends SysuiTestCase {
mTouchListenerCaptor.getValue().onTouch(mUdfpsView, event); mTouchListenerCaptor.getValue().onTouch(mUdfpsView, event);
mBiometricsExecutor.runAllReady(); mBiometricsExecutor.runAllReady();
event.recycle(); event.recycle();
if (testParams.hasAlternateTouchProvider) {
verify(mAlternateTouchProvider).onPointerDown(eq(TEST_REQUEST_ID), eq(expectedX), verify(mAlternateTouchProvider).onPointerDown(eq(TEST_REQUEST_ID), eq(expectedX),
eq(expectedY), eq(expectedMinor), eq(expectedMajor)); eq(expectedY), eq(expectedMinor), eq(expectedMajor));
} else {
verify(mFingerprintManager).onPointerDown(eq(TEST_REQUEST_ID),
eq(testParams.sensorProps.sensorId), eq(expectedX), eq(expectedY),
eq(expectedMinor), eq(expectedMajor));
}
// Test ROTATION_180 // Test ROTATION_180
reset(mAlternateTouchProvider); reset(mAlternateTouchProvider);
mUdfpsController.updateOverlayParams(mOpticalProps, reset(mFingerprintManager);
mUdfpsController.updateOverlayParams(testParams.sensorProps,
new UdfpsOverlayParams(sensorBounds, sensorBounds, displayWidth, displayHeight, new UdfpsOverlayParams(sensorBounds, sensorBounds, displayWidth, displayHeight,
scaleFactor, Surface.ROTATION_180)); scaleFactor, Surface.ROTATION_180));
// ROTATION_180 is not supported. It should be treated like ROTATION_0. // ROTATION_180 is not supported. It should be treated like ROTATION_0.
@@ -608,26 +642,22 @@ public class UdfpsControllerTest extends SysuiTestCase {
mTouchListenerCaptor.getValue().onTouch(mUdfpsView, event); mTouchListenerCaptor.getValue().onTouch(mUdfpsView, event);
mBiometricsExecutor.runAllReady(); mBiometricsExecutor.runAllReady();
event.recycle(); event.recycle();
if (testParams.hasAlternateTouchProvider) {
verify(mAlternateTouchProvider).onPointerDown(eq(TEST_REQUEST_ID), eq(expectedX), verify(mAlternateTouchProvider).onPointerDown(eq(TEST_REQUEST_ID), eq(expectedX),
eq(expectedY), eq(expectedMinor), eq(expectedMajor)); eq(expectedY), eq(expectedMinor), eq(expectedMajor));
} } else {
verify(mFingerprintManager).onPointerDown(eq(TEST_REQUEST_ID),
private void runForAllUdfpsTypes( eq(testParams.sensorProps.sensorId), eq(expectedX), eq(expectedY),
ThrowingConsumer<FingerprintSensorPropertiesInternal> sensorPropsConsumer) { eq(expectedMinor), eq(expectedMajor));
for (FingerprintSensorPropertiesInternal sensorProps : List.of(mOpticalProps,
mUltrasonicProps)) {
mUdfpsController.updateOverlayParams(sensorProps, new UdfpsOverlayParams());
sensorPropsConsumer.accept(sensorProps);
} }
} }
@Test @Test
public void fingerDown() { public void fingerDown() {
runForAllUdfpsTypes(this::fingerDownForSensor); runWithAllParams(this::fingerDownParameterized);
} }
private void fingerDownForSensor(FingerprintSensorPropertiesInternal sensorProps) private void fingerDownParameterized(TestParams testParams) throws RemoteException {
throws RemoteException {
reset(mUdfpsView, mAlternateTouchProvider, mFingerprintManager, mLatencyTracker, reset(mUdfpsView, mAlternateTouchProvider, mFingerprintManager, mLatencyTracker,
mKeyguardUpdateMonitor); mKeyguardUpdateMonitor);
@@ -637,7 +667,7 @@ public class UdfpsControllerTest extends SysuiTestCase {
when(mKeyguardUpdateMonitor.isFingerprintDetectionRunning()).thenReturn(true); when(mKeyguardUpdateMonitor.isFingerprintDetectionRunning()).thenReturn(true);
// GIVEN that the overlay is showing // GIVEN that the overlay is showing
mOverlayController.showUdfpsOverlay(TEST_REQUEST_ID, sensorProps.sensorId, mOverlayController.showUdfpsOverlay(TEST_REQUEST_ID, testParams.sensorProps.sensorId,
BiometricOverlayConstants.REASON_AUTH_KEYGUARD, mUdfpsOverlayControllerCallback); BiometricOverlayConstants.REASON_AUTH_KEYGUARD, mUdfpsOverlayControllerCallback);
mFgExecutor.runAllReady(); mFgExecutor.runAllReady();
verify(mUdfpsView).setOnTouchListener(mTouchListenerCaptor.capture()); verify(mUdfpsView).setOnTouchListener(mTouchListenerCaptor.capture());
@@ -655,14 +685,22 @@ public class UdfpsControllerTest extends SysuiTestCase {
mFgExecutor.runAllReady(); mFgExecutor.runAllReady();
// THEN FingerprintManager is notified about onPointerDown // THEN the touch provider is notified about onPointerDown.
if (testParams.hasAlternateTouchProvider) {
verify(mAlternateTouchProvider).onPointerDown(eq(TEST_REQUEST_ID), eq(0), eq(0), eq(0f), verify(mAlternateTouchProvider).onPointerDown(eq(TEST_REQUEST_ID), eq(0), eq(0), eq(0f),
eq(0f)); eq(0f));
verify(mFingerprintManager, never()).onPointerDown(anyLong(), anyInt(), anyInt(), anyInt(), verify(mFingerprintManager, never()).onPointerDown(anyLong(), anyInt(), anyInt(),
anyInt(), anyFloat(), anyFloat());
verify(mKeyguardUpdateMonitor).onUdfpsPointerDown(eq((int) TEST_REQUEST_ID));
} else {
verify(mFingerprintManager).onPointerDown(eq(TEST_REQUEST_ID),
eq(testParams.sensorProps.sensorId), eq(0), eq(0), eq(0f), eq(0f));
verify(mAlternateTouchProvider, never()).onPointerDown(anyInt(), anyInt(), anyInt(),
anyFloat(), anyFloat()); anyFloat(), anyFloat());
}
// AND display configuration begins // AND display configuration begins
if (sensorProps.sensorType == FingerprintSensorProperties.TYPE_UDFPS_OPTICAL) { if (testParams.sensorProps.sensorType == FingerprintSensorProperties.TYPE_UDFPS_OPTICAL) {
verify(mLatencyTracker).onActionStart(eq(LatencyTracker.ACTION_UDFPS_ILLUMINATE)); verify(mLatencyTracker).onActionStart(eq(LatencyTracker.ACTION_UDFPS_ILLUMINATE));
verify(mUdfpsView).configureDisplay(mOnDisplayConfiguredCaptor.capture()); verify(mUdfpsView).configureDisplay(mOnDisplayConfiguredCaptor.capture());
} else { } else {
@@ -671,16 +709,27 @@ public class UdfpsControllerTest extends SysuiTestCase {
verify(mUdfpsView, never()).configureDisplay(any()); verify(mUdfpsView, never()).configureDisplay(any());
} }
verify(mLatencyTracker, never()).onActionEnd(eq(LatencyTracker.ACTION_UDFPS_ILLUMINATE)); verify(mLatencyTracker, never()).onActionEnd(eq(LatencyTracker.ACTION_UDFPS_ILLUMINATE));
verify(mKeyguardUpdateMonitor).onUdfpsPointerDown(eq((int) TEST_REQUEST_ID));
if (sensorProps.sensorType == FingerprintSensorProperties.TYPE_UDFPS_OPTICAL) { if (testParams.sensorProps.sensorType == FingerprintSensorProperties.TYPE_UDFPS_OPTICAL) {
// AND onDisplayConfigured notifies FingerprintManager about onUiReady // AND onDisplayConfigured notifies FingerprintManager about onUiReady
mOnDisplayConfiguredCaptor.getValue().run(); mOnDisplayConfiguredCaptor.getValue().run();
mBiometricsExecutor.runAllReady(); mBiometricsExecutor.runAllReady();
if (testParams.hasAlternateTouchProvider) {
InOrder inOrder = inOrder(mAlternateTouchProvider, mLatencyTracker); InOrder inOrder = inOrder(mAlternateTouchProvider, mLatencyTracker);
inOrder.verify(mAlternateTouchProvider).onUiReady(); inOrder.verify(mAlternateTouchProvider).onUiReady();
inOrder.verify(mLatencyTracker).onActionEnd(eq(LatencyTracker.ACTION_UDFPS_ILLUMINATE)); inOrder.verify(mLatencyTracker).onActionEnd(
eq(LatencyTracker.ACTION_UDFPS_ILLUMINATE));
verify(mFingerprintManager, never()).onUiReady(anyLong(), anyInt());
} else { } else {
InOrder inOrder = inOrder(mFingerprintManager, mLatencyTracker);
inOrder.verify(mFingerprintManager).onUiReady(eq(TEST_REQUEST_ID),
eq(testParams.sensorProps.sensorId));
inOrder.verify(mLatencyTracker).onActionEnd(
eq(LatencyTracker.ACTION_UDFPS_ILLUMINATE));
verify(mAlternateTouchProvider, never()).onUiReady();
}
} else {
verify(mFingerprintManager, never()).onUiReady(anyLong(), anyInt());
verify(mAlternateTouchProvider, never()).onUiReady(); verify(mAlternateTouchProvider, never()).onUiReady();
verify(mLatencyTracker, never()).onActionEnd( verify(mLatencyTracker, never()).onActionEnd(
eq(LatencyTracker.ACTION_UDFPS_ILLUMINATE)); eq(LatencyTracker.ACTION_UDFPS_ILLUMINATE));
@@ -689,24 +738,23 @@ public class UdfpsControllerTest extends SysuiTestCase {
@Test @Test
public void aodInterrupt() { public void aodInterrupt() {
runForAllUdfpsTypes(this::aodInterruptForSensor); runWithAllParams(this::aodInterruptParameterized);
} }
private void aodInterruptForSensor(FingerprintSensorPropertiesInternal sensorProps) private void aodInterruptParameterized(TestParams testParams) throws RemoteException {
throws RemoteException {
mUdfpsController.cancelAodInterrupt(); mUdfpsController.cancelAodInterrupt();
reset(mUdfpsView, mAlternateTouchProvider, mFingerprintManager, mKeyguardUpdateMonitor); reset(mUdfpsView, mAlternateTouchProvider, mFingerprintManager, mKeyguardUpdateMonitor);
when(mKeyguardUpdateMonitor.isFingerprintDetectionRunning()).thenReturn(true); when(mKeyguardUpdateMonitor.isFingerprintDetectionRunning()).thenReturn(true);
// GIVEN that the overlay is showing and screen is on and fp is running // GIVEN that the overlay is showing and screen is on and fp is running
mOverlayController.showUdfpsOverlay(TEST_REQUEST_ID, sensorProps.sensorId, mOverlayController.showUdfpsOverlay(TEST_REQUEST_ID, testParams.sensorProps.sensorId,
BiometricOverlayConstants.REASON_AUTH_KEYGUARD, mUdfpsOverlayControllerCallback); BiometricOverlayConstants.REASON_AUTH_KEYGUARD, mUdfpsOverlayControllerCallback);
mScreenObserver.onScreenTurnedOn(); mScreenObserver.onScreenTurnedOn();
mFgExecutor.runAllReady(); mFgExecutor.runAllReady();
// WHEN fingerprint is requested because of AOD interrupt // WHEN fingerprint is requested because of AOD interrupt
mUdfpsController.onAodInterrupt(0, 0, 2f, 3f); mUdfpsController.onAodInterrupt(0, 0, 2f, 3f);
mFgExecutor.runAllReady(); mFgExecutor.runAllReady();
if (sensorProps.sensorType == FingerprintSensorProperties.TYPE_UDFPS_OPTICAL) { if (testParams.sensorProps.sensorType == FingerprintSensorProperties.TYPE_UDFPS_OPTICAL) {
// THEN display configuration begins // THEN display configuration begins
// AND onDisplayConfigured notifies FingerprintManager about onUiReady // AND onDisplayConfigured notifies FingerprintManager about onUiReady
verify(mUdfpsView).configureDisplay(mOnDisplayConfiguredCaptor.capture()); verify(mUdfpsView).configureDisplay(mOnDisplayConfiguredCaptor.capture());
@@ -715,29 +763,37 @@ public class UdfpsControllerTest extends SysuiTestCase {
verify(mUdfpsView, never()).configureDisplay(mOnDisplayConfiguredCaptor.capture()); verify(mUdfpsView, never()).configureDisplay(mOnDisplayConfiguredCaptor.capture());
} }
mBiometricsExecutor.runAllReady(); mBiometricsExecutor.runAllReady();
verify(mAlternateTouchProvider).onPointerDown(eq(TEST_REQUEST_ID),
eq(0), eq(0), eq(3f) /* minor */, eq(2f) /* major */); if (testParams.hasAlternateTouchProvider) {
verify(mFingerprintManager, never()).onPointerDown(anyLong(), anyInt(), anyInt(), anyInt(), verify(mAlternateTouchProvider).onPointerDown(eq(TEST_REQUEST_ID), eq(0), eq(0),
anyFloat(), anyFloat()); eq(3f) /* minor */, eq(2f) /* major */);
verify(mFingerprintManager, never()).onPointerDown(anyLong(), anyInt(), anyInt(),
anyInt(), anyFloat(), anyFloat());
verify(mKeyguardUpdateMonitor).onUdfpsPointerDown(eq((int) TEST_REQUEST_ID)); verify(mKeyguardUpdateMonitor).onUdfpsPointerDown(eq((int) TEST_REQUEST_ID));
} else {
verify(mFingerprintManager).onPointerDown(eq(TEST_REQUEST_ID),
eq(testParams.sensorProps.sensorId), eq(0), eq(0), eq(3f) /* minor */,
eq(2f) /* major */);
verify(mAlternateTouchProvider, never()).onPointerDown(anyLong(), anyInt(), anyInt(),
anyFloat(), anyFloat());
}
} }
@Test @Test
public void cancelAodInterrupt() { public void cancelAodInterrupt() {
runForAllUdfpsTypes(this::cancelAodInterruptForSensor); runWithAllParams(this::cancelAodInterruptParameterized);
} }
private void cancelAodInterruptForSensor(FingerprintSensorPropertiesInternal sensorProps) private void cancelAodInterruptParameterized(TestParams testParams) throws RemoteException {
throws RemoteException {
reset(mUdfpsView); reset(mUdfpsView);
// GIVEN AOD interrupt // GIVEN AOD interrupt
mOverlayController.showUdfpsOverlay(TEST_REQUEST_ID, sensorProps.sensorId, mOverlayController.showUdfpsOverlay(TEST_REQUEST_ID, testParams.sensorProps.sensorId,
BiometricOverlayConstants.REASON_AUTH_KEYGUARD, mUdfpsOverlayControllerCallback); BiometricOverlayConstants.REASON_AUTH_KEYGUARD, mUdfpsOverlayControllerCallback);
mScreenObserver.onScreenTurnedOn(); mScreenObserver.onScreenTurnedOn();
mFgExecutor.runAllReady(); mFgExecutor.runAllReady();
mUdfpsController.onAodInterrupt(0, 0, 0f, 0f); mUdfpsController.onAodInterrupt(0, 0, 0f, 0f);
if (sensorProps.sensorType == FingerprintSensorProperties.TYPE_UDFPS_OPTICAL) { if (testParams.sensorProps.sensorType == FingerprintSensorProperties.TYPE_UDFPS_OPTICAL) {
when(mUdfpsView.isDisplayConfigured()).thenReturn(true); when(mUdfpsView.isDisplayConfigured()).thenReturn(true);
// WHEN it is cancelled // WHEN it is cancelled
mUdfpsController.cancelAodInterrupt(); mUdfpsController.cancelAodInterrupt();
@@ -754,21 +810,20 @@ public class UdfpsControllerTest extends SysuiTestCase {
@Test @Test
public void aodInterruptTimeout() { public void aodInterruptTimeout() {
runForAllUdfpsTypes(this::aodInterruptTimeoutForSensor); runWithAllParams(this::aodInterruptTimeoutParameterized);
} }
private void aodInterruptTimeoutForSensor(FingerprintSensorPropertiesInternal sensorProps) private void aodInterruptTimeoutParameterized(TestParams testParams) throws RemoteException {
throws RemoteException {
reset(mUdfpsView); reset(mUdfpsView);
// GIVEN AOD interrupt // GIVEN AOD interrupt
mOverlayController.showUdfpsOverlay(TEST_REQUEST_ID, sensorProps.sensorId, mOverlayController.showUdfpsOverlay(TEST_REQUEST_ID, testParams.sensorProps.sensorId,
BiometricOverlayConstants.REASON_AUTH_KEYGUARD, mUdfpsOverlayControllerCallback); BiometricOverlayConstants.REASON_AUTH_KEYGUARD, mUdfpsOverlayControllerCallback);
mScreenObserver.onScreenTurnedOn(); mScreenObserver.onScreenTurnedOn();
mFgExecutor.runAllReady(); mFgExecutor.runAllReady();
mUdfpsController.onAodInterrupt(0, 0, 0f, 0f); mUdfpsController.onAodInterrupt(0, 0, 0f, 0f);
mFgExecutor.runAllReady(); mFgExecutor.runAllReady();
if (sensorProps.sensorType == FingerprintSensorProperties.TYPE_UDFPS_OPTICAL) { if (testParams.sensorProps.sensorType == FingerprintSensorProperties.TYPE_UDFPS_OPTICAL) {
when(mUdfpsView.isDisplayConfigured()).thenReturn(true); when(mUdfpsView.isDisplayConfigured()).thenReturn(true);
} else { } else {
when(mUdfpsView.isDisplayConfigured()).thenReturn(false); when(mUdfpsView.isDisplayConfigured()).thenReturn(false);
@@ -776,7 +831,7 @@ public class UdfpsControllerTest extends SysuiTestCase {
// WHEN it times out // WHEN it times out
mFgExecutor.advanceClockToNext(); mFgExecutor.advanceClockToNext();
mFgExecutor.runAllReady(); mFgExecutor.runAllReady();
if (sensorProps.sensorType == FingerprintSensorProperties.TYPE_UDFPS_OPTICAL) { if (testParams.sensorProps.sensorType == FingerprintSensorProperties.TYPE_UDFPS_OPTICAL) {
// THEN the display is unconfigured. // THEN the display is unconfigured.
verify(mUdfpsView).unconfigureDisplay(); verify(mUdfpsView).unconfigureDisplay();
} else { } else {
@@ -787,23 +842,23 @@ public class UdfpsControllerTest extends SysuiTestCase {
@Test @Test
public void aodInterruptCancelTimeoutActionOnFingerUp() { public void aodInterruptCancelTimeoutActionOnFingerUp() {
runForAllUdfpsTypes(this::aodInterruptCancelTimeoutActionOnFingerUpForSensor); runWithAllParams(this::aodInterruptCancelTimeoutActionOnFingerUpParameterized);
} }
private void aodInterruptCancelTimeoutActionOnFingerUpForSensor( private void aodInterruptCancelTimeoutActionOnFingerUpParameterized(TestParams testParams)
FingerprintSensorPropertiesInternal sensorProps) throws RemoteException { throws RemoteException {
reset(mUdfpsView); reset(mUdfpsView);
when(mUdfpsView.isWithinSensorArea(anyFloat(), anyFloat())).thenReturn(true); when(mUdfpsView.isWithinSensorArea(anyFloat(), anyFloat())).thenReturn(true);
// GIVEN AOD interrupt // GIVEN AOD interrupt
mOverlayController.showUdfpsOverlay(TEST_REQUEST_ID, sensorProps.sensorId, mOverlayController.showUdfpsOverlay(TEST_REQUEST_ID, testParams.sensorProps.sensorId,
BiometricOverlayConstants.REASON_AUTH_KEYGUARD, mUdfpsOverlayControllerCallback); BiometricOverlayConstants.REASON_AUTH_KEYGUARD, mUdfpsOverlayControllerCallback);
mScreenObserver.onScreenTurnedOn(); mScreenObserver.onScreenTurnedOn();
mFgExecutor.runAllReady(); mFgExecutor.runAllReady();
mUdfpsController.onAodInterrupt(0, 0, 0f, 0f); mUdfpsController.onAodInterrupt(0, 0, 0f, 0f);
mFgExecutor.runAllReady(); mFgExecutor.runAllReady();
if (sensorProps.sensorType == FingerprintSensorProperties.TYPE_UDFPS_OPTICAL) { if (testParams.sensorProps.sensorType == FingerprintSensorProperties.TYPE_UDFPS_OPTICAL) {
// Configure UdfpsView to accept the ACTION_UP event // Configure UdfpsView to accept the ACTION_UP event
when(mUdfpsView.isDisplayConfigured()).thenReturn(true); when(mUdfpsView.isDisplayConfigured()).thenReturn(true);
} else { } else {
@@ -833,7 +888,7 @@ public class UdfpsControllerTest extends SysuiTestCase {
moveEvent.recycle(); moveEvent.recycle();
mFgExecutor.runAllReady(); mFgExecutor.runAllReady();
if (sensorProps.sensorType == FingerprintSensorProperties.TYPE_UDFPS_OPTICAL) { if (testParams.sensorProps.sensorType == FingerprintSensorProperties.TYPE_UDFPS_OPTICAL) {
// Configure UdfpsView to accept the finger up event // Configure UdfpsView to accept the finger up event
when(mUdfpsView.isDisplayConfigured()).thenReturn(true); when(mUdfpsView.isDisplayConfigured()).thenReturn(true);
} else { } else {
@@ -844,7 +899,7 @@ public class UdfpsControllerTest extends SysuiTestCase {
mFgExecutor.advanceClockToNext(); mFgExecutor.advanceClockToNext();
mFgExecutor.runAllReady(); mFgExecutor.runAllReady();
if (sensorProps.sensorType == FingerprintSensorProperties.TYPE_UDFPS_OPTICAL) { if (testParams.sensorProps.sensorType == FingerprintSensorProperties.TYPE_UDFPS_OPTICAL) {
// THEN the display should be unconfigured once. If the timeout action is not // THEN the display should be unconfigured once. If the timeout action is not
// cancelled, the display would be unconfigured twice which would cause two // cancelled, the display would be unconfigured twice which would cause two
// FP attempts. // FP attempts.
@@ -856,23 +911,23 @@ public class UdfpsControllerTest extends SysuiTestCase {
@Test @Test
public void aodInterruptCancelTimeoutActionOnAcquired() { public void aodInterruptCancelTimeoutActionOnAcquired() {
runForAllUdfpsTypes(this::aodInterruptCancelTimeoutActionOnAcquiredForSensor); runWithAllParams(this::aodInterruptCancelTimeoutActionOnAcquiredParameterized);
} }
private void aodInterruptCancelTimeoutActionOnAcquiredForSensor( private void aodInterruptCancelTimeoutActionOnAcquiredParameterized(TestParams testParams)
FingerprintSensorPropertiesInternal sensorProps) throws RemoteException { throws RemoteException {
reset(mUdfpsView); reset(mUdfpsView);
when(mUdfpsView.isWithinSensorArea(anyFloat(), anyFloat())).thenReturn(true); when(mUdfpsView.isWithinSensorArea(anyFloat(), anyFloat())).thenReturn(true);
// GIVEN AOD interrupt // GIVEN AOD interrupt
mOverlayController.showUdfpsOverlay(TEST_REQUEST_ID, sensorProps.sensorId, mOverlayController.showUdfpsOverlay(TEST_REQUEST_ID, testParams.sensorProps.sensorId,
BiometricOverlayConstants.REASON_AUTH_KEYGUARD, mUdfpsOverlayControllerCallback); BiometricOverlayConstants.REASON_AUTH_KEYGUARD, mUdfpsOverlayControllerCallback);
mScreenObserver.onScreenTurnedOn(); mScreenObserver.onScreenTurnedOn();
mFgExecutor.runAllReady(); mFgExecutor.runAllReady();
mUdfpsController.onAodInterrupt(0, 0, 0f, 0f); mUdfpsController.onAodInterrupt(0, 0, 0f, 0f);
mFgExecutor.runAllReady(); mFgExecutor.runAllReady();
if (sensorProps.sensorType == FingerprintSensorProperties.TYPE_UDFPS_OPTICAL) { if (testParams.sensorProps.sensorType == FingerprintSensorProperties.TYPE_UDFPS_OPTICAL) {
// Configure UdfpsView to accept the acquired event // Configure UdfpsView to accept the acquired event
when(mUdfpsView.isDisplayConfigured()).thenReturn(true); when(mUdfpsView.isDisplayConfigured()).thenReturn(true);
} else { } else {
@@ -880,7 +935,7 @@ public class UdfpsControllerTest extends SysuiTestCase {
} }
// WHEN acquired is received // WHEN acquired is received
mOverlayController.onAcquired(sensorProps.sensorId, mOverlayController.onAcquired(testParams.sensorProps.sensorId,
BiometricFingerprintConstants.FINGERPRINT_ACQUIRED_GOOD); BiometricFingerprintConstants.FINGERPRINT_ACQUIRED_GOOD);
// Configure UdfpsView to accept the ACTION_DOWN event // Configure UdfpsView to accept the ACTION_DOWN event
@@ -900,7 +955,7 @@ public class UdfpsControllerTest extends SysuiTestCase {
moveEvent.recycle(); moveEvent.recycle();
mFgExecutor.runAllReady(); mFgExecutor.runAllReady();
if (sensorProps.sensorType == FingerprintSensorProperties.TYPE_UDFPS_OPTICAL) { if (testParams.sensorProps.sensorType == FingerprintSensorProperties.TYPE_UDFPS_OPTICAL) {
// Configure UdfpsView to accept the finger up event // Configure UdfpsView to accept the finger up event
when(mUdfpsView.isDisplayConfigured()).thenReturn(true); when(mUdfpsView.isDisplayConfigured()).thenReturn(true);
} else { } else {
@@ -911,7 +966,7 @@ public class UdfpsControllerTest extends SysuiTestCase {
mFgExecutor.advanceClockToNext(); mFgExecutor.advanceClockToNext();
mFgExecutor.runAllReady(); mFgExecutor.runAllReady();
if (sensorProps.sensorType == FingerprintSensorProperties.TYPE_UDFPS_OPTICAL) { if (testParams.sensorProps.sensorType == FingerprintSensorProperties.TYPE_UDFPS_OPTICAL) {
// THEN the display should be unconfigured once. If the timeout action is not // THEN the display should be unconfigured once. If the timeout action is not
// cancelled, the display would be unconfigured twice which would cause two // cancelled, the display would be unconfigured twice which would cause two
// FP attempts. // FP attempts.
@@ -923,15 +978,14 @@ public class UdfpsControllerTest extends SysuiTestCase {
@Test @Test
public void aodInterruptScreenOff() { public void aodInterruptScreenOff() {
runForAllUdfpsTypes(this::aodInterruptScreenOffForSensor); runWithAllParams(this::aodInterruptScreenOffParameterized);
} }
private void aodInterruptScreenOffForSensor(FingerprintSensorPropertiesInternal sensorProps) private void aodInterruptScreenOffParameterized(TestParams testParams) throws RemoteException {
throws RemoteException {
reset(mUdfpsView); reset(mUdfpsView);
// GIVEN screen off // GIVEN screen off
mOverlayController.showUdfpsOverlay(TEST_REQUEST_ID, sensorProps.sensorId, mOverlayController.showUdfpsOverlay(TEST_REQUEST_ID, testParams.sensorProps.sensorId,
BiometricOverlayConstants.REASON_AUTH_KEYGUARD, mUdfpsOverlayControllerCallback); BiometricOverlayConstants.REASON_AUTH_KEYGUARD, mUdfpsOverlayControllerCallback);
mScreenObserver.onScreenTurnedOff(); mScreenObserver.onScreenTurnedOff();
mFgExecutor.runAllReady(); mFgExecutor.runAllReady();
@@ -945,17 +999,16 @@ public class UdfpsControllerTest extends SysuiTestCase {
@Test @Test
public void aodInterrupt_fingerprintNotRunning() { public void aodInterrupt_fingerprintNotRunning() {
runForAllUdfpsTypes(this::aodInterrupt_fingerprintNotRunningForSensor); runWithAllParams(this::aodInterrupt_fingerprintNotRunningParameterized);
} }
private void aodInterrupt_fingerprintNotRunningForSensor( private void aodInterrupt_fingerprintNotRunningParameterized(TestParams testParams)
FingerprintSensorPropertiesInternal sensorProps) throws RemoteException { throws RemoteException {
reset(mUdfpsView); reset(mUdfpsView);
// GIVEN showing overlay // GIVEN showing overlay
mOverlayController.showUdfpsOverlay(TEST_REQUEST_ID, sensorProps.sensorId, mOverlayController.showUdfpsOverlay(TEST_REQUEST_ID, testParams.sensorProps.sensorId,
BiometricOverlayConstants.REASON_AUTH_KEYGUARD, BiometricOverlayConstants.REASON_AUTH_KEYGUARD, mUdfpsOverlayControllerCallback);
mUdfpsOverlayControllerCallback);
mScreenObserver.onScreenTurnedOn(); mScreenObserver.onScreenTurnedOn();
mFgExecutor.runAllReady(); mFgExecutor.runAllReady();