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

Commit b0a35de1 authored by Rubin Xu's avatar Rubin Xu Committed by Android (Google) Code Review
Browse files

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

parents 01933aa0 c548977e

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