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

Merge "According to the enrolled status to show/hide face unlock results" into rvc-dev am: ec606d6cdf am: bd27683632

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

Change-Id: I0cebc3bef3647df08ab11e4d0886654bc300c265
This commit is contained in:
Yanting Yang
2020-06-19 08:16:46 +00:00
committed by Automerger Merge Worker
parent cd0ffda87d bd27683632
commit 570f8e54f7
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/com/android/settings/biometrics/face/FaceSettings.java
View File

@@ -323,16 +323,18 @@ public class FaceSettings extends DashboardFragment {
@Override @Override
protected boolean isPageSearchEnabled(Context context) { protected boolean isPageSearchEnabled(Context context) {
return isAvailable(context); if (isAvailable(context)) {
return hasEnrolledBiometrics(context);
}
return false;
} }
@Override @Override
public List<String> getNonIndexableKeys(Context context) { public List<String> getNonIndexableKeys(Context context) {
final List<String> keys = super.getNonIndexableKeys(context); final List<String> keys = super.getNonIndexableKeys(context);
if (isAvailable(context)) { if (isAvailable(context)) {
final FaceManager faceManager = context.getSystemService(FaceManager.class); final boolean hasEnrolled = hasEnrolledBiometrics(context);
final boolean hasEnrolled = faceManager.hasEnrolledTemplates(
UserHandle.myUserId());
keys.add(hasEnrolled ? PREF_KEY_ENROLL_FACE_UNLOCK keys.add(hasEnrolled ? PREF_KEY_ENROLL_FACE_UNLOCK
: PREF_KEY_DELETE_FACE_DATA); : PREF_KEY_DELETE_FACE_DATA);
} }
@@ -353,5 +355,13 @@ public class FaceSettings extends DashboardFragment {
} }
return isAttentionSupported; return isAttentionSupported;
} }
private boolean hasEnrolledBiometrics(Context context) {
final FaceManager faceManager = Utils.getFaceManagerOrNull(context);
if (faceManager != null) {
return faceManager.hasEnrolledTemplates(UserHandle.myUserId());
}
return false;
}
}; };
} }