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

Fixed unicorn multi-enrollment flow.

Browse Source 
Test: Verified that Unicorn SUW flows can now
enroll a face.
Test: Verified normal SUW flow works as expected.

Fixes: 237088482
Fixes: 234663447
Change-Id: I9c4100f61b5e7d40fc9ed67c6918ec7bf31fc30a
This commit is contained in:
Joshua McCloskey
2022-06-28 01:54:15 +00:00
parent dc72a4a14f
commit cdb654f9be
9 changed files with 35 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/unit/src/com/android/settings/biometrics/ParentalConsentHelperTest.java
View File

@@ -82,7 +82,7 @@ public class ParentalConsentHelperTest {
}
@Test
public void testLaunchNext_face_and_fingerprint_all_consent() {
public void testLaunchNext__fingerprint_all_consent() {
testLaunchNext(
true /* requireFace */, true /* grantFace */,
true /* requireFingerprint */, true /* grantFace */,
@@ -158,13 +158,13 @@ public class ParentalConsentHelperTest {
boolean requireFingerprint, boolean grantFingerprint,
long gkpw) {
final List<Pair<String, Boolean>> expectedLaunches = new ArrayList<>();
if (requireFace) {
expectedLaunches.add(new Pair(FaceEnrollParentalConsent.class.getName(), grantFace));
}
if (requireFingerprint) {
expectedLaunches.add(
new Pair(FingerprintEnrollParentalConsent.class.getName(), grantFingerprint));
}
if (requireFace) {
expectedLaunches.add(new Pair(FaceEnrollParentalConsent.class.getName(), grantFace));
}
// initial consent status
final ParentalConsentHelper helper = new ParentalConsentHelper(gkpw);