Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 95a27be9 authored by Yanting Yang's avatar Yanting Yang Committed by Automerger Merge Worker
Browse files

Merge "According to the enrolled status to show/hide face unlock results" into... 

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

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

Change-Id: I5898459457a73270e973304c2cb3a8c0a1c80527
parents c3a501c0 ec606d6c

src/com/android/settings/biometrics/face/FaceSettings.java

+14 −4
Original line number Diff line number Diff line
@@ -323,16 +323,18 @@ public class FaceSettings extends DashboardFragment { 


                @Override

                protected boolean isPageSearchEnabled(Context context) {

                    return isAvailable(context);

                    if (isAvailable(context)) {

                        return hasEnrolledBiometrics(context);

                    }



                    return false;

                }



                @Override

                public List<String> getNonIndexableKeys(Context context) {

                    final List<String> keys = super.getNonIndexableKeys(context);

                    if (isAvailable(context)) {

                        final FaceManager faceManager = context.getSystemService(FaceManager.class);

                        final boolean hasEnrolled = faceManager.hasEnrolledTemplates(

                                UserHandle.myUserId());

                        final boolean hasEnrolled = hasEnrolledBiometrics(context);

                        keys.add(hasEnrolled ? PREF_KEY_ENROLL_FACE_UNLOCK

                                : PREF_KEY_DELETE_FACE_DATA);

                    }
@@ -353,5 +355,13 @@ public class FaceSettings extends DashboardFragment { 
                    }

                    return isAttentionSupported;

                }



                private boolean hasEnrolledBiometrics(Context context) {

                    final FaceManager faceManager = Utils.getFaceManagerOrNull(context);

                    if (faceManager != null) {

                        return faceManager.hasEnrolledTemplates(UserHandle.myUserId());

                    }

                    return false;

                }

            };

}