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

Merge "Fix NPE in AddUserWhenLockedPreferenceController."

Browse Source
This commit is contained in:
Ben Murdoch
2020-02-18 09:44:18 +00:00
committed by Android (Google) Code Review
parent bd57dbaaf9 c20d548ad9
commit 3980183ee0
3 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/users/AddUserWhenLockedPreferenceController.java
View File

@@ -28,15 +28,12 @@ import com.android.settingslib.RestrictedSwitchPreference;
public class AddUserWhenLockedPreferenceController extends TogglePreferenceController {
private final UserCapabilities mUserCaps;
private LockPatternUtils mLockPatternUtils;
private final LockPatternUtils mLockPatternUtils;
public AddUserWhenLockedPreferenceController(Context context, String key) {
super(context, key);
mUserCaps = UserCapabilities.create(context);
}
void setLockPatternUtils(LockPatternUtils lockPatternUtils) {
mLockPatternUtils = lockPatternUtils;
mLockPatternUtils = new LockPatternUtils(context);
}
@Override

3
src/com/android/settings/users/UserSettings.java
View File

@@ -241,8 +241,6 @@ public class UserSettings extends SettingsPreferenceFragment
mAddUserWhenLockedPreferenceController = new AddUserWhenLockedPreferenceController(
activity, KEY_ADD_USER_WHEN_LOCKED);
mAddUserWhenLockedPreferenceController.setLockPatternUtils(
new LockPatternUtils(getPrefContext()));
mMultiUserFooterPreferenceController = new MultiUserFooterPreferenceController(activity,
KEY_MULTIUSER_FOOTER);
@@ -1296,7 +1294,6 @@ public class UserSettings extends SettingsPreferenceFragment
AddUserWhenLockedPreferenceController controller =
new AddUserWhenLockedPreferenceController(
context, KEY_ADD_USER_WHEN_LOCKED);
controller.setLockPatternUtils(new LockPatternUtils(context));
controller.updateNonIndexableKeys(niks);
new AutoSyncDataPreferenceController(context, null /* parent */)
.updateNonIndexableKeys(niks);