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

Commit 9b102c89 authored by Oli Thompson's avatar Oli Thompson Committed by Android (Google) Code Review
Browse files

Merge "Correctly unlock storage for work profiles with unified challenge" into main

parents 54461d26 fb08a809

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

+2 −1
Original line number Diff line number Diff line
@@ -278,7 +278,8 @@ public class ConfirmDeviceCredentialActivity extends FragmentActivity { 
                    .setRequestWriteRepairModePassword(true)

                    .setForceVerifyPath(true)

                    .show();

        } else if (isEffectiveUserManagedProfile && isInternalActivity()) {

        } else if (mLockPatternUtils.isManagedProfileWithUnifiedChallenge(mUserId)

                && isInternalActivity()) {

            // When the mForceVerifyPath is set to true, we launch the real confirm credential

            // activity with an explicit but fake challenge value (0L). This will result in

            // ConfirmLockPassword calling verifyTiedProfileChallenge() (if it's a profile with