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 am: b0a35de10b

Browse Source 
am: 95970db0fa

Change-Id: Ieba5594887ba89afa43c56ae3991830fa1372270
This commit is contained in:
Rubin Xu
2018-03-29 09:05:48 +00:00
committed by android-build-merger
parent bd838bde93 95970db0fa
commit 53f59f9214
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