Merge "Show confirm credential activity on parent when unpausing work." into udc-dev

2023-03-14 14:43:11 +00:00
parent a9142c6a75 f3ad58a060
commit 383be3acdb
1 changed files with 2 additions and 1 deletions
--- a/services/core/java/com/android/server/pm/UserManagerService.java
+++ b/services/core/java/com/android/server/pm/UserManagerService.java
@@ -1545,7 +1545,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