commit 1d0b02f7efbae92aea1726bc595fa75151eba7f3
author Reema Bajwa <reemabajwa@google.com> Sat Oct 07 04:25:37 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Oct 07 04:25:37 2023 +0000
tree 682f24a4de97949ed70dba47413acd8b33daefaa
parent 4ac86ddd3f8e7682e0b7f08def897245bd0865de
parent a75c8e7b68f9d3ff0eac572190fe2894a768345c

Merge "Create pending intent for specific user" into main

services/credentials/java/com/android/server/credentials/CredentialManagerUi.java

diff --git a/services/credentials/java/com/android/server/credentials/CredentialManagerUi.java b/services/credentials/java/com/android/server/credentials/CredentialManagerUi.java
index b90f08e..3c190bf 100644
--- a/services/credentials/java/com/android/server/credentials/CredentialManagerUi.java
+++ b/services/credentials/java/com/android/server/credentials/CredentialManagerUi.java
@@ -32,6 +32,7 @@
 import android.os.IBinder;
 import android.os.Looper;
 import android.os.ResultReceiver;
+import android.os.UserHandle;
 import android.service.credentials.CredentialProviderInfoFactory;
 import android.util.Slog;
 
@@ -171,7 +172,9 @@
                 .setAction(UUID.randomUUID().toString());
         //TODO: Create unique pending intent using request code and cancel any pre-existing pending
         // intents
-        return PendingIntent.getActivity(
-                mContext, /*requestCode=*/0, intent, PendingIntent.FLAG_IMMUTABLE);
+        return PendingIntent.getActivityAsUser(
+                mContext, /*requestCode=*/0, intent,
+                PendingIntent.FLAG_IMMUTABLE, /*options=*/null,
+                UserHandle.of(mUserId));
     }
 }