diff options
| author | Ben Murdoch <benm@google.com> | 2020-02-14 14:49:12 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2020-02-17 18:02:28 +0000 |
| commit | c20d548ad939e3a26fdf574ca29fdbef651a367f (patch) | |
| tree | fa235d3a6536a247a7b5b87b1f2a4d325766f414 /src/com/android/settings/users | |
| parent | acc2fe085aabc62318d2faae70b57055ff5e1979 (diff) | |
| download | packages_apps_Settings-c20d548ad939e3a26fdf574ca29fdbef651a367f.tar.gz packages_apps_Settings-c20d548ad939e3a26fdf574ca29fdbef651a367f.tar.bz2 packages_apps_Settings-c20d548ad939e3a26fdf574ca29fdbef651a367f.zip | |
Fix NPE in AddUserWhenLockedPreferenceController.
Set LockPatternUtils in constructor, but allow it to be
overridden for tests.
Bug: 149511500
Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.users.AddUserWhenLockedPreferenceControllerTest"
Change-Id: I4148fec8eea9c76afebe45cc29c2c87775fd3b1e
Diffstat (limited to 'src/com/android/settings/users')
| -rw-r--r-- | src/com/android/settings/users/AddUserWhenLockedPreferenceController.java | 7 | ||||
| -rw-r--r-- | src/com/android/settings/users/UserSettings.java | 3 |
2 files changed, 2 insertions, 8 deletions
diff --git a/src/com/android/settings/users/AddUserWhenLockedPreferenceController.java b/src/com/android/settings/users/AddUserWhenLockedPreferenceController.java index 34892fa242..df2f54effb 100644 --- a/src/com/android/settings/users/AddUserWhenLockedPreferenceController.java +++ b/src/com/android/settings/users/AddUserWhenLockedPreferenceController.java @@ -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 diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java index 51da9d2e7c..6397af8efb 100644 --- a/src/com/android/settings/users/UserSettings.java +++ b/src/com/android/settings/users/UserSettings.java @@ -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); |