From 66095680b2f3c7492d5824d876e2becfc9eb1b65 Mon Sep 17 00:00:00 2001 From: Joshua Mccloskey Date: Thu, 10 Mar 2022 20:17:38 +0000 Subject: [PATCH] Allow deferred SUW to add multiple fingerprints Test: Verified that I could add extra fingerprints in deferred SUW. Test: m -j30 RunSettingsRoboTests ROBOTEST_FILTER=FingerprintEnrollIntroductionTest Fixes: 204846146 Fixes: 223722376 Change-Id: Ib3fc31131e97f13512783ca2bab9d205da3a4044 --- .../FingerprintEnrollIntroduction.java | 12 +- .../FingerprintEnrollIntroductionTest.java | 176 ++++++++++++++++++ 2 files changed, 185 insertions(+), 3 deletions(-) create mode 100644 tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroductionTest.java diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java index 2ef5446dd31..23595fb91f9 100644 --- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java @@ -35,6 +35,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.StringRes; +import com.android.internal.annotations.VisibleForTesting; import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.biometrics.BiometricEnrollIntroduction; @@ -55,6 +56,7 @@ public class FingerprintEnrollIntroduction extends BiometricEnrollIntroduction { private static final String TAG = "FingerprintIntro"; + @VisibleForTesting private FingerprintManager mFingerprintManager; @Nullable private FooterButton mPrimaryFooterButton; @Nullable private FooterButton mSecondaryFooterButton; @@ -213,6 +215,8 @@ public class FingerprintEnrollIntroduction extends BiometricEnrollIntroduction { @Override protected int checkMaxEnrolled() { final boolean isSetupWizard = WizardManagerHelper.isAnySetupWizard(getIntent()); + final boolean isDeferredSetupWizard = + WizardManagerHelper.isDeferredSetupWizard(getIntent()); if (mFingerprintManager != null) { final List props = mFingerprintManager.getSensorPropertiesInternal(); @@ -220,9 +224,11 @@ public class FingerprintEnrollIntroduction extends BiometricEnrollIntroduction { final int max = props.get(0).maxEnrollmentsPerUser; final int numEnrolledFingerprints = mFingerprintManager.getEnrolledFingerprints(mUserId).size(); - final int maxFingerprintsEnrollableIfSUW = getApplicationContext().getResources() - .getInteger(R.integer.suw_max_fingerprints_enrollable); - if (isSetupWizard) { + final int maxFingerprintsEnrollableIfSUW = + getApplicationContext() + .getResources() + .getInteger(R.integer.suw_max_fingerprints_enrollable); + if (isSetupWizard && !isDeferredSetupWizard) { if (numEnrolledFingerprints >= maxFingerprintsEnrollableIfSUW) { return R.string.fingerprint_intro_error_max; } else { diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroductionTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroductionTest.java new file mode 100644 index 00000000000..d8852dbb739 --- /dev/null +++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroductionTest.java @@ -0,0 +1,176 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.settings.biometrics.fingerprint; + +import static com.google.common.truth.Truth.assertThat; + +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.when; + +import android.content.Context; +import android.content.Intent; +import android.content.res.Resources; +import android.hardware.biometrics.ComponentInfoInternal; +import android.hardware.biometrics.SensorProperties; +import android.hardware.fingerprint.Fingerprint; +import android.hardware.fingerprint.FingerprintManager; +import android.hardware.fingerprint.FingerprintSensorProperties; +import android.hardware.fingerprint.FingerprintSensorPropertiesInternal; + +import com.android.settings.R; + +import com.google.android.setupcompat.util.WizardManagerHelper; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; +import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; +import org.robolectric.RuntimeEnvironment; +import org.robolectric.android.controller.ActivityController; +import org.robolectric.util.ReflectionHelpers; + +import java.util.ArrayList; +import java.util.List; + +@RunWith(RobolectricTestRunner.class) +public class FingerprintEnrollIntroductionTest { + + @Mock private FingerprintManager mFingerprintManager; + + private Context mContext; + + private FingerprintEnrollIntroduction mFingerprintEnrollIntroduction; + + private static final int MAX_ENROLLMENTS = 5; + + @Before + public void setUp() { + MockitoAnnotations.initMocks(this); + mContext = spy(RuntimeEnvironment.application.getApplicationContext()); + + final List componentInfo = new ArrayList<>(); + final FingerprintSensorPropertiesInternal prop = + new FingerprintSensorPropertiesInternal( + 0 /* sensorId */, + SensorProperties.STRENGTH_STRONG, + MAX_ENROLLMENTS /* maxEnrollmentsPerUser */, + componentInfo, + FingerprintSensorProperties.TYPE_REAR, + true /* resetLockoutRequiresHardwareAuthToken */); + final ArrayList props = new ArrayList<>(); + props.add(prop); + when(mFingerprintManager.getSensorPropertiesInternal()).thenReturn(props); + } + + void setupFingerprintEnrollIntroWith(Intent intent) { + ActivityController controller = + Robolectric.buildActivity(FingerprintEnrollIntroduction.class, intent); + mFingerprintEnrollIntroduction = spy(controller.get()); + ReflectionHelpers.setField( + mFingerprintEnrollIntroduction, "mFingerprintManager", mFingerprintManager); + controller.create(); + } + + void setFingerprintManagerToHave(int numEnrollments) { + List fingerprints = new ArrayList<>(); + for (int i = 0; i < numEnrollments; i++) { + fingerprints.add( + new Fingerprint( + "Fingerprint " + i /* name */, 1 /*fingerId */, 1 /* deviceId */)); + } + when(mFingerprintManager.getEnrolledFingerprints(anyInt())).thenReturn(fingerprints); + } + + @Test + public void intro_CheckCanEnrollNormal() { + setupFingerprintEnrollIntroWith(new Intent()); + setFingerprintManagerToHave(3 /* numEnrollments */); + int result = mFingerprintEnrollIntroduction.checkMaxEnrolled(); + + assertThat(result).isEqualTo(0); + } + + @Test + public void intro_CheckMaxEnrolledNormal() { + setupFingerprintEnrollIntroWith(new Intent()); + setFingerprintManagerToHave(7 /* numEnrollments */); + int result = mFingerprintEnrollIntroduction.checkMaxEnrolled(); + + assertThat(result).isEqualTo(R.string.fingerprint_intro_error_max); + } + + @Test + public void intro_CheckCanEnrollDuringSUW() { + // This code path should depend on suw_max_fingerprints_enrollable versus + // FingerprintManager.getSensorProperties...maxEnrollmentsPerUser() + Resources resources = mock(Resources.class); + when(resources.getInteger(anyInt())).thenReturn(5); + when(mContext.getResources()).thenReturn(resources); + + setupFingerprintEnrollIntroWith( + new Intent() + .putExtra(WizardManagerHelper.EXTRA_IS_FIRST_RUN, true) + .putExtra(WizardManagerHelper.EXTRA_IS_SETUP_FLOW, true)); + setFingerprintManagerToHave(0 /* numEnrollments */); + int result = mFingerprintEnrollIntroduction.checkMaxEnrolled(); + + assertThat(result).isEqualTo(0); + } + + @Test + public void intro_CheckMaxEnrolledDuringSUW() { + // This code path should depend on suw_max_fingerprints_enrollable versus + // FingerprintManager.getSensorProperties...maxEnrollmentsPerUser() + Resources resources = mock(Resources.class); + when(mContext.getResources()).thenReturn(resources); + when(resources.getInteger(anyInt())).thenReturn(1); + + setupFingerprintEnrollIntroWith( + new Intent() + .putExtra(WizardManagerHelper.EXTRA_IS_FIRST_RUN, true) + .putExtra(WizardManagerHelper.EXTRA_IS_SETUP_FLOW, true)); + setFingerprintManagerToHave(1 /* numEnrollments */); + int result = mFingerprintEnrollIntroduction.checkMaxEnrolled(); + + assertThat(result).isEqualTo(R.string.fingerprint_intro_error_max); + } + + @Test + public void intro_CheckCanEnrollDuringDeferred() { + setupFingerprintEnrollIntroWith( + new Intent().putExtra(WizardManagerHelper.EXTRA_IS_DEFERRED_SETUP, true)); + setFingerprintManagerToHave(2 /* numEnrollments */); + int result = mFingerprintEnrollIntroduction.checkMaxEnrolled(); + + assertThat(result).isEqualTo(0); + } + + @Test + public void intro_CheckMaxEnrolledDuringDeferred() { + setupFingerprintEnrollIntroWith( + new Intent().putExtra(WizardManagerHelper.EXTRA_IS_DEFERRED_SETUP, true)); + setFingerprintManagerToHave(6 /* numEnrollments */); + int result = mFingerprintEnrollIntroduction.checkMaxEnrolled(); + + assertThat(result).isEqualTo(R.string.fingerprint_intro_error_max); + } +}