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

Revert "Revert "Return enrollment consent status to caller.""

Browse Source 
This reverts commit c358adad56.

Reason for revert: Applying original change with additional change for single sensor devices.

Bug: 192420564
Bug: 188847063

Test: manual enroll face & fingerprint via setup wizard (on fp, face, & fp+face device variants)

Change-Id: Idfaaa2b6f4611056f9999325bac8401e28a7510b
This commit is contained in:
Joe Bolinger
2021-06-30 20:56:48 +00:00
parent a86c8be5fa
commit c17876365a
3 changed files with 75 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/biometrics/ParentalConsentHelper.java
View File

@@ -46,6 +46,7 @@ public class ParentalConsentHelper {
private static final String KEY_FACE_CONSENT = "face";
private static final String KEY_FINGERPRINT_CONSENT = "fingerprint";
private static final String KEY_IRIS_CONSENT = "iris";
private final boolean mRequireFace;
private final boolean mRequireFingerprint;
@@ -153,6 +154,7 @@ public class ParentalConsentHelper {
result.putBoolean(KEY_FACE_CONSENT, mConsentFace != null ? mConsentFace : false);
result.putBoolean(KEY_FINGERPRINT_CONSENT,
mConsentFingerprint != null ? mConsentFingerprint : false);
result.putBoolean(KEY_IRIS_CONSENT, false);
return result;
}