Merge "UserController.shouldConfirmCredentials uses isCredentialSharedWithParent" into tm-dev (ca989e89) · Commits · e / os / android_frameworks_base

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)) {