PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Set face unlock toggle to unchecked when disabled by admin" into rvc-dev am: a2d56af9bd am: ea63b90c3d am: 4b997ee9fd am: 599f02eab1

Browse Source 
Change-Id: I9349594dd1e6e65c441f45563b7add8453ae5aea
This commit is contained in:
TreeHugger Robot
2020-03-31 05:03:23 +00:00
committed by Automerger Merge Worker
parent f833efefdb 599f02eab1
commit cfcc352af6
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/biometrics/face/FaceSettingsLockscreenBypassPreferenceController.java
View File

@@ -47,6 +47,11 @@ public class FaceSettingsLockscreenBypassPreferenceController
@Override @Override
public boolean isChecked() { public boolean isChecked() {
if (!FaceSettings.isAvailable(mContext)) {
return false;
} else if (getRestrictingAdmin() != null) {
return false;
}
int defaultValue = mContext.getResources().getBoolean( int defaultValue = mContext.getResources().getBoolean(
com.android.internal.R.bool.config_faceAuthDismissesKeyguard) ? 1 : 0; com.android.internal.R.bool.config_faceAuthDismissesKeyguard) ? 1 : 0;
return Settings.Secure.getIntForUser(mContext.getContentResolver(), return Settings.Secure.getIntForUser(mContext.getContentResolver(),

1
tests/robotests/src/com/android/settings/biometrics/face/FaceSettingsLockscreenBypassPreferenceControllerTest.java
View File

@@ -93,6 +93,7 @@ public class FaceSettingsLockscreenBypassPreferenceControllerTest {
boolean state = Settings.Secure.getInt(mContext.getContentResolver(), boolean state = Settings.Secure.getInt(mContext.getContentResolver(),
Settings.Secure.FACE_UNLOCK_DISMISSES_KEYGUARD, defaultValue ? 1 : 0) != 0; Settings.Secure.FACE_UNLOCK_DISMISSES_KEYGUARD, defaultValue ? 1 : 0) != 0;
assertThat(mController.isChecked()).isFalse();
assertThat(mController.onPreferenceChange(mPreference, !state)).isTrue(); assertThat(mController.onPreferenceChange(mPreference, !state)).isTrue();
boolean newState = Settings.Secure.getInt(mContext.getContentResolver(), boolean newState = Settings.Secure.getInt(mContext.getContentResolver(),
Settings.Secure.FACE_UNLOCK_DISMISSES_KEYGUARD, 0) != 0; Settings.Secure.FACE_UNLOCK_DISMISSES_KEYGUARD, 0) != 0;