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

Merge "Disable combined controller only if all modalities require consent" into sc-v2-dev am: b84b7d586a

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

Change-Id: Idb41f923cdbe1ebc251a1c033d8066404898f768
This commit is contained in:
TreeHugger Robot
2021-11-18 03:41:27 +00:00
committed by Automerger Merge Worker
parent 0fefda6870 b84b7d586a
commit 2fc75eba80
5 changed files with 81 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/robotests/src/com/android/settings/biometrics/combination/CombinedBiometricStatusPreferenceControllerTest.java
View File

@@ -104,12 +104,16 @@ public class CombinedBiometricStatusPreferenceControllerTest {
RestrictedLockUtils.EnforcedAdmin admin = mock(RestrictedLockUtils.EnforcedAdmin.class);
mController.mPreference = restrictedPreference;
mController.updateStateInternal(admin);
mController.updateStateInternal(admin, true, true);
verify(restrictedPreference).setDisabledByAdmin(eq(admin));
reset(admin);
mController.updateStateInternal(admin, true, false);
verify(restrictedPreference).setDisabledByAdmin(eq(null));
mController.updateStateInternal(null /* enforcedAdmin */);
verify(restrictedPreference, never()).setDisabledByAdmin(any());
mController.updateStateInternal(admin, false, true);
verify(restrictedPreference).setDisabledByAdmin(eq(null));
mController.updateStateInternal(admin, false, false);
verify(restrictedPreference).setDisabledByAdmin(eq(null));
}
}

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

@@ -167,8 +167,8 @@ public class ParentalConsentHelperTest {
}
// initial consent status
final ParentalConsentHelper helper =
new ParentalConsentHelper(requireFace, requireFingerprint, gkpw);
final ParentalConsentHelper helper = new ParentalConsentHelper(gkpw);
helper.setConsentRequirement(requireFace, requireFingerprint);
assertThat(ParentalConsentHelper.hasFaceConsent(helper.getConsentResult()))
.isFalse();
assertThat(ParentalConsentHelper.hasFingerprintConsent(helper.getConsentResult()))