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

Merge "Do not update unified setting before updating primary profile lock" into nyc-dev am: 8e91558

Browse Source 
am: 16d93fb

* commit '16d93fbae43639ae421045b4fcbcc650fec02865':
  Do not update unified setting before updating primary profile lock

Change-Id: I99b287d03411311d807d739e529813d80dd82adc
This commit is contained in:
Ricky Wai
2016-04-12 17:16:23 +00:00
committed by android-build-merger
parent e247608846 16d93fbae4
commit 3d4f71ec99
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/SecuritySettings.java
View File

@@ -706,8 +706,6 @@ public class SecuritySettings extends SettingsPreferenceFragment
private void unifyLocks() {
int profileQuality =
mLockPatternUtils.getKeyguardStoredPasswordQuality(mProfileChallengeUserId);
mLockPatternUtils.setSeparateProfileChallengeEnabled(mProfileChallengeUserId, false,
mCurrentProfilePassword);
if (profileQuality == DevicePolicyManager.PASSWORD_QUALITY_SOMETHING) {
mLockPatternUtils.saveLockPattern(
LockPatternUtils.stringToPattern(mCurrentProfilePassword),
@@ -717,6 +715,8 @@ public class SecuritySettings extends SettingsPreferenceFragment
mCurrentProfilePassword, mCurrentDevicePassword,
profileQuality, MY_USER_ID);
}
mLockPatternUtils.setSeparateProfileChallengeEnabled(mProfileChallengeUserId, false,
mCurrentProfilePassword);
final boolean profilePatternVisibility =
mLockPatternUtils.isVisiblePatternEnabled(mProfileChallengeUserId);
mLockPatternUtils.setVisiblePatternEnabled(profilePatternVisibility, MY_USER_ID);