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 am: ca989e8921

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17004854

Change-Id: If269dc24d34b1d998be16ecd4e573562e3408d9a
This commit is contained in:
Adam Bookatz
2022-03-01 17:29:01 +00:00
committed by Automerger Merge Worker
parent aa888bc144 ca989e8921
commit 70dcd7c8af
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)) {