PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Hide enrollment options that don't match requested biometric strength

Browse Source 
When calling biometric enroll intent with biometric_strong, don't include
weak enrollments as options.

Bug: 265898482
Test: Tested manually by calling enrollment and verifying correct
options are shown
Test: atest BiometricEnrollActivityTest

Change-Id: I5fa650a593aee536955ae806f5963ffbdc135a2e
This commit is contained in:
Austin Delgado
2023-04-14 15:49:52 -07:00
parent e346dc6779
commit 0ea56b4fec
2 changed files with 78 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
tests/componenttests/src/com/android/settings/biometrics/BiometricEnrollActivityTest.java
View File

@@ -16,6 +16,7 @@
package com.android.settings.biometrics;
import static android.hardware.biometrics.BiometricManager.Authenticators.BIOMETRIC_STRONG;
import static android.provider.Settings.ACTION_BIOMETRIC_ENROLL;
import static androidx.test.espresso.intent.Intents.intended;
@@ -33,7 +34,13 @@ import static org.junit.Assume.assumeTrue;
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.hardware.biometrics.SensorProperties;
import android.hardware.face.FaceManager;
import android.hardware.face.FaceSensorPropertiesInternal;
import android.hardware.fingerprint.FingerprintManager;
import android.hardware.fingerprint.FingerprintSensorPropertiesInternal;
import android.os.UserHandle;
import android.provider.Settings;
import androidx.test.core.app.ActivityScenario;
import androidx.test.core.app.ApplicationProvider;
@@ -56,6 +63,8 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import java.util.List;
@RunWith(AndroidJUnit4.class)
@MediumTest
public class BiometricEnrollActivityTest {
@@ -67,6 +76,8 @@ public class BiometricEnrollActivityTest {
private final Context mContext = ApplicationProvider.getApplicationContext();
private boolean mHasFace;
private boolean mHasFingerprint;
private boolean mIsFaceStrong;
private boolean mIsFingerprintStrong;
@Before
public void setup() {
@@ -74,6 +85,28 @@ public class BiometricEnrollActivityTest {
final PackageManager pm = mContext.getPackageManager();
mHasFingerprint = pm.hasSystemFeature(PackageManager.FEATURE_FINGERPRINT);
mHasFace = pm.hasSystemFeature(PackageManager.FEATURE_FACE);
if (mHasFace) {
final FaceManager faceManager = mContext.getSystemService(FaceManager.class);
final List<FaceSensorPropertiesInternal> faceProperties =
faceManager.getSensorPropertiesInternal();
if (!faceProperties.isEmpty()) {
final FaceSensorPropertiesInternal faceProp = faceProperties.get(0);
mIsFaceStrong = faceProp.sensorStrength == SensorProperties.STRENGTH_STRONG;
}
}
if (mHasFingerprint) {
final FingerprintManager fingerprintManager = mContext.getSystemService(
FingerprintManager.class);
final List<FingerprintSensorPropertiesInternal> fingerProperties =
fingerprintManager.getSensorPropertiesInternal();
if (!fingerProperties.isEmpty()) {
final FingerprintSensorPropertiesInternal fingerProp = fingerProperties.get(0);
mIsFingerprintStrong =
fingerProp.sensorStrength == SensorProperties.STRENGTH_STRONG;
}
}
}
@After
@@ -129,6 +162,27 @@ public class BiometricEnrollActivityTest {
}
}
@Test
public void launchWithStrongBiometricAllowed_doNotEnrollWeak() throws Exception {
assumeTrue(mHasFace || mHasFingerprint);
// Allow only strong biometrics
Intent intent = getIntent();
intent.putExtra(Settings.EXTRA_BIOMETRIC_AUTHENTICATORS_ALLOWED, BIOMETRIC_STRONG);
try (ActivityScenario<BiometricEnrollActivity> scenario =
ActivityScenario.launch(intent)) {
intended(hasComponent(ChooseLockGeneric.class.getName()));
if (mIsFaceStrong && mIsFingerprintStrong) {
intended(hasExtra(EXTRA_KEY_FOR_BIOMETRICS, true));
} else if (mIsFaceStrong) {
intended(hasExtra(EXTRA_KEY_FOR_FACE, true));
} else if (mIsFingerprintStrong) {
intended(hasExtra(EXTRA_KEY_FOR_FINGERPRINT, true));
}
}
}
private Intent getIntent() {
return getIntent(false /* useInternal */);
}