Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 95970db0 authored by Rubin Xu's avatar Rubin Xu Committed by android-build-merger
Browse files

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

am: b0a35de1

Change-Id: I8df143549c8e4bb0e79350c8ee3d993a039f112f
parents b2f7a325 b0a35de1

src/com/android/settings/password/ChooseLockGeneric.java

+2 −1
Original line number Diff line number Diff line
@@ -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