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

Merge "Confirm parent user's credential when setting lock for profile" into pi-dev

Browse Source 
am: b0a35de10b

Change-Id: I8df143549c8e4bb0e79350c8ee3d993a039f112f
This commit is contained in:
Rubin Xu
2018-03-29 08:49:24 +00:00
committed by android-build-merger
parent b2f7a325b4 b0a35de10b
commit 95970db0fa
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/password/ChooseLockGeneric.java
View File

@@ -236,7 +236,8 @@ public class ChooseLockGeneric extends SettingsActivity {
boolean managedProfileWithUnifiedLock =
UserManager.get(getActivity()).isManagedProfile(mUserId)
&& !mLockPatternUtils.isSeparateProfileChallengeEnabled(mUserId);
if (managedProfileWithUnifiedLock
boolean skipConfirmation = managedProfileWithUnifiedLock && !mIsSetNewPassword;
if (skipConfirmation
|| !helper.launchConfirmationActivity(CONFIRM_EXISTING_REQUEST,
getString(R.string.unlock_set_unlock_launch_picker_title), true, mUserId)) {
mPasswordConfirmed = true; // no password set, so no need to confirm