Merge "Override device lock pattern visibility when unifying" into nyc-dev

am: f19001f

* commit 'f19001f2c0517b478dd07feb9b7427a1b506adb1':
  Override device lock pattern visibility when unifying

Change-Id: I3a73cc8ad0edb8f87f20043107fb23c3ce70cc10
This commit is contained in:
Daniel U
2016-03-29 09:40:51 +00:00
committed by android-build-merger

View File

@@ -684,6 +684,9 @@ public class SecuritySettings extends SettingsPreferenceFragment
mCurrentProfilePassword, mCurrentDevicePassword, mCurrentProfilePassword, mCurrentDevicePassword,
profileQuality, MY_USER_ID); profileQuality, MY_USER_ID);
} }
final boolean profilePatternVisibility =
mLockPatternUtils.isVisiblePatternEnabled(mProfileChallengeUserId);
mLockPatternUtils.setVisiblePatternEnabled(profilePatternVisibility, MY_USER_ID);
mCurrentDevicePassword = null; mCurrentDevicePassword = null;
mCurrentProfilePassword = null; mCurrentProfilePassword = null;
} }