Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "UserController.shouldConfirmCredentials uses isCredentialSharedWithParent" into tm-dev

Browse Source
This commit is contained in:
Adam Bookatz
2022-03-01 17:08:11 +00:00
committed by Android (Google) Code Review
parent 8056335fcd ab085c6351
commit ca989e8921
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/am/UserController.java
View File

@@ -2613,7 +2613,7 @@ class UserController implements Handler.Callback {
if (getStartedUserState(userId) == null) { if (getStartedUserState(userId) == null) {
return false; return false;
} }
if (!getUserInfo(userId).isManagedProfile()) { if (!mInjector.getUserManager().isCredentialSharedWithParent(userId)) {
return false; return false;
} }
if (mLockPatternUtils.isSeparateProfileChallengeEnabled(userId)) { if (mLockPatternUtils.isSeparateProfileChallengeEnabled(userId)) {