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

Merge "Fixed unicorn multi-enrollment flow." into tm-d1-dev am: 431542dddc

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19093051

Change-Id: I4574d7014cfb6ca9050428e451654b9e8002995b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Joshua Mccloskey
2022-06-29 17:12:05 +00:00
committed by Automerger Merge Worker
parent 6de8a405d7 431542dddc
commit e30a71787e
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);