Merge "Update Settings to match Framework"
This commit is contained in:
committed by
Android (Google) Code Review
commit
847865dca8
@@ -113,7 +113,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);
|
||||
@@ -180,7 +180,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);
|
||||
@@ -218,7 +218,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);
|
||||
@@ -256,7 +256,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);
|
||||
|
Reference in New Issue
Block a user