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

2022-03-01 17:08:11 +00:00
parent 8056335fcd ab085c6351
commit ca989e8921
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/am/UserController.java
+++ b/services/core/java/com/android/server/am/UserController.java
@@ -2613,7 +2613,7 @@ class UserController implements Handler.Callback {
        if (getStartedUserState(userId) == null) {
            return false;
        }
-        if (!getUserInfo(userId).isManagedProfile()) {
+        if (!mInjector.getUserManager().isCredentialSharedWithParent(userId)) {
            return false;
        }
        if (mLockPatternUtils.isSeparateProfileChallengeEnabled(userId)) {