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

Fix NPE in AddUserWhenLockedPreferenceController.

Browse Source 
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
This commit is contained in:
Ben Murdoch
2020-02-14 14:49:12 +00:00
parent acc2fe085a
commit c20d548ad9
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