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

Merge "Fix setting crash when removing screenlock with fp" into oc-dev

Browse Source 
am: 339d117b46

Change-Id: I2fa18ac32053f3390d6cb821042ea0c63e6f4e86
This commit is contained in:
Kevin Chyn
2017-04-15 09:26:12 +00:00
committed by android-build-merger
parent ab2bb40659 339d117b46
commit c27f924e0e
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/ChooseLockGeneric.java
View File

@@ -129,6 +129,7 @@ public class ChooseLockGeneric extends SettingsActivity {
private boolean mHideDrawer = false; private boolean mHideDrawer = false;
private ManagedLockPasswordProvider mManagedPasswordProvider; private ManagedLockPasswordProvider mManagedPasswordProvider;
private boolean mIsSetNewPassword = false; private boolean mIsSetNewPassword = false;
private UserManager mUserManager;
protected boolean mForFingerprint = false; protected boolean mForFingerprint = false;
@@ -166,6 +167,7 @@ public class ChooseLockGeneric extends SettingsActivity {
ChooseLockSettingsHelper.EXTRA_KEY_FOR_FINGERPRINT, false); ChooseLockSettingsHelper.EXTRA_KEY_FOR_FINGERPRINT, false);
mForChangeCredRequiredForBoot = getArguments() != null && getArguments().getBoolean( mForChangeCredRequiredForBoot = getArguments() != null && getArguments().getBoolean(
ChooseLockSettingsHelper.EXTRA_KEY_FOR_CHANGE_CRED_REQUIRED_FOR_BOOT); ChooseLockSettingsHelper.EXTRA_KEY_FOR_CHANGE_CRED_REQUIRED_FOR_BOOT);
mUserManager = UserManager.get(getActivity());
if (savedInstanceState != null) { if (savedInstanceState != null) {
mPasswordConfirmed = savedInstanceState.getBoolean(PASSWORD_CONFIRMED); mPasswordConfirmed = savedInstanceState.getBoolean(PASSWORD_CONFIRMED);
@@ -751,11 +753,10 @@ public class ChooseLockGeneric extends SettingsActivity {
if (mFingerprintManager != null && mFingerprintManager.isHardwareDetected()) { if (mFingerprintManager != null && mFingerprintManager.isHardwareDetected()) {
mFingerprintManager.setActiveUser(UserHandle.myUserId()); mFingerprintManager.setActiveUser(UserHandle.myUserId());
} }
final UserManager um = UserManager.get(getActivity());
boolean hasChildProfile = false; boolean hasChildProfile = false;
if (!um.getUserInfo(parentUserId).isManagedProfile()) { if (!mUserManager.getUserInfo(parentUserId).isManagedProfile()) {
// Current user is primary profile, remove work profile fingerprints if necessary // Current user is primary profile, remove work profile fingerprints if necessary
final List<UserInfo> profiles = um.getProfiles(parentUserId); final List<UserInfo> profiles = mUserManager.getProfiles(parentUserId);
final int profilesSize = profiles.size(); final int profilesSize = profiles.size();
for (int i = 0; i < profilesSize; i++) { for (int i = 0; i < profilesSize; i++) {
final UserInfo userInfo = profiles.get(i); final UserInfo userInfo = profiles.get(i);