From 76d40d3efb65368a0f6dfe5ecb0c8be588ef1e34 Mon Sep 17 00:00:00 2001 From: Kevin Chyn Date: Sun, 26 Aug 2018 15:43:00 -0700 Subject: [PATCH] Update Settings to match Framework Bug: 72825012 Test: atest SettingsRoboTests Change-Id: Ie59347bcb5d6748b3e684541b390c8e5f6db3f4a --- .../biometrics/face/FaceStatusPreferenceController.java | 2 +- src/com/android/settings/password/ChooseLockGeneric.java | 2 +- .../settings/password/SetNewPasswordController.java | 2 +- .../face/FaceStatusPreferenceControllerTest.java | 2 +- .../settings/password/SetNewPasswordControllerTest.java | 8 ++++---- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/com/android/settings/biometrics/face/FaceStatusPreferenceController.java b/src/com/android/settings/biometrics/face/FaceStatusPreferenceController.java index 9a146608fb4..cd27dbbe3d5 100644 --- a/src/com/android/settings/biometrics/face/FaceStatusPreferenceController.java +++ b/src/com/android/settings/biometrics/face/FaceStatusPreferenceController.java @@ -46,7 +46,7 @@ public class FaceStatusPreferenceController extends BiometricStatusPreferenceCon @Override protected boolean hasEnrolledBiometrics() { - return mFaceManager.hasEnrolledFaces(mUserId); + return mFaceManager.hasEnrolledTemplates(mUserId); } @Override diff --git a/src/com/android/settings/password/ChooseLockGeneric.java b/src/com/android/settings/password/ChooseLockGeneric.java index a45bea77ead..6ed87b8bd1a 100644 --- a/src/com/android/settings/password/ChooseLockGeneric.java +++ b/src/com/android/settings/password/ChooseLockGeneric.java @@ -805,7 +805,7 @@ public class ChooseLockGeneric extends SettingsActivity { // TODO: figure out how to eliminate duplicated code. It's a bit hard due to the async-ness private void removeAllFaceForUserAndFinish(final int userId, RemovalTracker tracker) { if (mFaceManager != null && mFaceManager.isHardwareDetected()) { - if (mFaceManager.hasEnrolledFaces(userId)) { + if (mFaceManager.hasEnrolledTemplates(userId)) { mFaceManager.setActiveUser(userId); Face face = new Face(null, 0, 0); mFaceManager.remove(face, userId, diff --git a/src/com/android/settings/password/SetNewPasswordController.java b/src/com/android/settings/password/SetNewPasswordController.java index 94bc928761f..1e0aa33851e 100644 --- a/src/com/android/settings/password/SetNewPasswordController.java +++ b/src/com/android/settings/password/SetNewPasswordController.java @@ -114,7 +114,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) diff --git a/tests/robotests/src/com/android/settings/biometrics/face/FaceStatusPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/biometrics/face/FaceStatusPreferenceControllerTest.java index bde1c3eeca0..f12003ae42d 100644 --- a/tests/robotests/src/com/android/settings/biometrics/face/FaceStatusPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/biometrics/face/FaceStatusPreferenceControllerTest.java @@ -119,7 +119,7 @@ public class FaceStatusPreferenceControllerTest { when(mFaceManager.isHardwareDetected()).thenReturn(true); when(mFaceManager.getEnrolledFaces(anyInt())) .thenReturn(Collections.singletonList(mock(Face.class))); - when(mFaceManager.hasEnrolledFaces(anyInt())) + when(mFaceManager.hasEnrolledTemplates(anyInt())) .thenReturn(true); mController.updateState(mPreference); diff --git a/tests/robotests/src/com/android/settings/password/SetNewPasswordControllerTest.java b/tests/robotests/src/com/android/settings/password/SetNewPasswordControllerTest.java index 97fb7775530..e6441af9fcc 100644 --- a/tests/robotests/src/com/android/settings/password/SetNewPasswordControllerTest.java +++ b/tests/robotests/src/com/android/settings/password/SetNewPasswordControllerTest.java @@ -110,7 +110,7 @@ public final class SetNewPasswordControllerTest { // GIVEN the device supports face. when(mFaceManager.isHardwareDetected()).thenReturn(true); // GIVEN there are no enrolled face. - when(mFaceManager.hasEnrolledFaces(CURRENT_USER_ID)).thenReturn(false); + when(mFaceManager.hasEnrolledTemplates(CURRENT_USER_ID)).thenReturn(false); // GIVEN DPC does not disallow face for keyguard usage. when(mDevicePolicyManager.getKeyguardDisabledFeatures(any(ComponentName.class))) .thenReturn(0); @@ -177,7 +177,7 @@ public final class SetNewPasswordControllerTest { // GIVEN the device does NOT support face. when(mFaceManager.isHardwareDetected()).thenReturn(false); // GIVEN there are no enrolled face. - when(mFaceManager.hasEnrolledFaces(CURRENT_USER_ID)).thenReturn(false); + when(mFaceManager.hasEnrolledTemplates(CURRENT_USER_ID)).thenReturn(false); // GIVEN DPC does not disallow face for keyguard usage. when(mDevicePolicyManager.getKeyguardDisabledFeatures(any(ComponentName.class))) .thenReturn(0); @@ -215,7 +215,7 @@ public final class SetNewPasswordControllerTest { // GIVEN the device supports face. when(mFaceManager.isHardwareDetected()).thenReturn(true); // GIVEN there are no enrolled face. - when(mFaceManager.hasEnrolledFaces(CURRENT_USER_ID)).thenReturn(true); + when(mFaceManager.hasEnrolledTemplates(CURRENT_USER_ID)).thenReturn(true); // GIVEN DPC does not disallow face for keyguard usage. when(mDevicePolicyManager.getKeyguardDisabledFeatures(any(ComponentName.class))) .thenReturn(0); @@ -253,7 +253,7 @@ public final class SetNewPasswordControllerTest { // GIVEN the device supports face. when(mFaceManager.isHardwareDetected()).thenReturn(true); // GIVEN there is an enrolled face. - when(mFaceManager.hasEnrolledFaces(CURRENT_USER_ID)).thenReturn(true); + when(mFaceManager.hasEnrolledTemplates(CURRENT_USER_ID)).thenReturn(true); // GIVEN DPC disallows face for keyguard usage. when(mDevicePolicyManager.getKeyguardDisabledFeatures(any(ComponentName.class))) .thenReturn(DevicePolicyManager.KEYGUARD_DISABLE_FACE);