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

Merge "Fix NPE when user goes from none to swipe for lockscreen"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-10-16 11:17:57 +00:00
committed by Android (Google) Code Review
parent 4b55d88c1e 3bf2e70745
commit f956e4bd96
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/password/ChooseLockGeneric.java
View File

@@ -760,8 +760,12 @@ public class ChooseLockGeneric extends SettingsActivity {
if (quality == DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED) { if (quality == DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED) {
// Clearing of user biometrics when screen lock is cleared is done at // Clearing of user biometrics when screen lock is cleared is done at
// LockSettingsService.removeBiometricsForUser(). // LockSettingsService.removeBiometricsForUser().
mChooseLockSettingsHelper.utils().setLockCredential( if (mUserPassword != null) {
LockscreenCredential.createNone(), mUserPassword, mUserId); // No need to call setLockCredential if the user currently doesn't
// have a password
mChooseLockSettingsHelper.utils().setLockCredential(
LockscreenCredential.createNone(), mUserPassword, mUserId);
}
mChooseLockSettingsHelper.utils().setLockScreenDisabled(disabled, mUserId); mChooseLockSettingsHelper.utils().setLockScreenDisabled(disabled, mUserId);
getActivity().setResult(Activity.RESULT_OK); getActivity().setResult(Activity.RESULT_OK);
finish(); finish();