Merge "Update Settings to match Framework"

2018-08-31 01:21:07 +00:00
parent da3e0348b8 76d40d3efb
commit 847865dca8
5 changed files with 8 additions and 8 deletions
--- a/src/com/android/settings/password/SetNewPasswordController.java
+++ b/src/com/android/settings/password/SetNewPasswordController.java
@@ -115,7 +115,7 @@ final class SetNewPasswordController {
        if (mPackageManager.hasSystemFeature(PackageManager.FEATURE_FACE)
                && mFaceManager != null
                && mFaceManager.isHardwareDetected()
-                && !mFaceManager.hasEnrolledFaces(mTargetUserId)
+                && !mFaceManager.hasEnrolledTemplates(mTargetUserId)
                && !isFaceDisabledByAdmin()) {
            extras = getFaceChooseLockExtras();
        } else if (mPackageManager.hasSystemFeature(PackageManager.FEATURE_FINGERPRINT)