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/tests/robotests/src/com/android/settings/biometrics/face/FaceStatusPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/biometrics/face/FaceStatusPreferenceControllerTest.java
@@ -121,7 +121,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);