Merge "Set screen lock for the parent profile instead of system user" into main (6b8799c2) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/pm/UserManagerService.java

+5 −3

Original line number	Diff line number	Diff line
		@@ -1719,10 +1719,11 @@ public class UserManagerService extends IUserManager.Stub {
		}

		final KeyguardManager km = mContext.getSystemService(KeyguardManager.class);
		if (km != null && km.isDeviceSecure()) {
		int parentUserId = getProfileParentId(userId);
		if (km != null && km.isDeviceSecure(parentUserId)) {
		showConfirmCredentialToDisableQuietMode(userId, target, callingPackage);
		return false;
		} else if (km != null && !km.isDeviceSecure()
		} else if (km != null && !km.isDeviceSecure(parentUserId)
		&& android.multiuser.Flags.showSetScreenLockDialog()
		// TODO(b/330720545): Add a better way to accomplish this, also use it
		// to block profile creation w/o device credentials present.
		@@ -1732,7 +1733,8 @@ public class UserManagerService extends IUserManager.Stub {
		SetScreenLockDialogActivity
		.createBaseIntent(LAUNCH_REASON_DISABLE_QUIET_MODE);
		setScreenLockPromptIntent.putExtra(EXTRA_ORIGIN_USER_ID, userId);
		mContext.startActivity(setScreenLockPromptIntent);
		mContext.startActivityAsUser(setScreenLockPromptIntent,
		UserHandle.of(parentUserId));
		return false;
		} else {
		Slog.w(LOG_TAG, "Allowing profile unlock even when device credentials "