From f3ad58a0609abb639c8c75cecf7e44a8128c19a3 Mon Sep 17 00:00:00 2001 From: Oli Lan Date: Mon, 13 Mar 2023 17:21:05 +0000 Subject: [PATCH] Show confirm credential activity on parent when unpausing work. This fixes an issue affecting HSUM where the credential activity was shown on user 0 rather than on the parent of the profile. Bug: 272704160 Test: manual, flash and test unpausing profile Change-Id: I97f4ecea33933fe7c404330a056cb274cfc1ed0a --- .../core/java/com/android/server/pm/UserManagerService.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java index 334317281a1c1..616fa93c67dd8 100644 --- a/services/core/java/com/android/server/pm/UserManagerService.java +++ b/services/core/java/com/android/server/pm/UserManagerService.java @@ -1495,7 +1495,8 @@ public class UserManagerService extends IUserManager.Stub { // intentSender unlockIntent.putExtra(Intent.EXTRA_INTENT, pendingIntent.getIntentSender()); unlockIntent.setFlags(FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS); - mContext.startActivity(unlockIntent); + mContext.startActivityAsUser( + unlockIntent, UserHandle.of(getProfileParentIdUnchecked(userId))); } @Override