Commit 70dcd7c8 authored Mar 01, 2022 by Adam Bookatz Committed by Automerger Merge Worker Mar 01, 2022

Merge "UserController.shouldConfirmCredentials uses...

Merge "UserController.shouldConfirmCredentials uses isCredentialSharedWithParent" into tm-dev am: ca989e89

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

Change-Id: If269dc24d34b1d998be16ecd4e573562e3408d9a

services/core/java/com/android/server/am/UserController.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -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)) {