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

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

Browse Source
This commit is contained in:
Oli Thompson
2024-04-30 13:33:47 +00:00
committed by Android (Google) Code Review
parent 54461d2679 fb08a80955
commit 9b102c8921
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/ConfirmDeviceCredentialActivity.java
View File

@@ -278,7 +278,8 @@ public class ConfirmDeviceCredentialActivity extends FragmentActivity {
.setRequestWriteRepairModePassword(true) .setRequestWriteRepairModePassword(true)
.setForceVerifyPath(true) .setForceVerifyPath(true)
.show(); .show();
} else if (isEffectiveUserManagedProfile && isInternalActivity()) { } else if (mLockPatternUtils.isManagedProfileWithUnifiedChallenge(mUserId)
&& isInternalActivity()) {
// When the mForceVerifyPath is set to true, we launch the real confirm credential // 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 // activity with an explicit but fake challenge value (0L). This will result in
// ConfirmLockPassword calling verifyTiedProfileChallenge() (if it's a profile with // ConfirmLockPassword calling verifyTiedProfileChallenge() (if it's a profile with