From 8f4991fdf4ec9c91319379e66889465679d55461 Mon Sep 17 00:00:00 2001
From: Evan Chen <evanxinchen@google.com>
Date: Wed, 14 Sep 2022 18:44:51 +0000
Subject: [PATCH] Allow multi users for building permission transfer intent

Auto uses user 10, so we need to support multi users by using
getActivityAsUser

Bug: 244429866
Test: atest CtsCompanionDeviceManagerUiAutomationTestCases

Change-Id: I5ca6db3f3427589dab34ccc34ac20379f2db48a7
---
 .../companion/datatransfer/SystemDataTransferProcessor.java  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/services/companion/java/com/android/server/companion/datatransfer/SystemDataTransferProcessor.java b/services/companion/java/com/android/server/companion/datatransfer/SystemDataTransferProcessor.java
index be81b67a5c745..10d3556fec432 100644
--- a/services/companion/java/com/android/server/companion/datatransfer/SystemDataTransferProcessor.java
+++ b/services/companion/java/com/android/server/companion/datatransfer/SystemDataTransferProcessor.java
@@ -150,8 +150,9 @@ public class SystemDataTransferProcessor {
         // Create a PendingIntent
         final long token = Binder.clearCallingIdentity();
         try {
-            return PendingIntent.getActivity(mContext, /*requestCode */ associationId, intent,
-                    FLAG_ONE_SHOT | FLAG_CANCEL_CURRENT | FLAG_IMMUTABLE);
+            return PendingIntent.getActivityAsUser(mContext, /*requestCode */ associationId, intent,
+                    FLAG_ONE_SHOT | FLAG_CANCEL_CURRENT | FLAG_IMMUTABLE, /* options= */ null,
+                    UserHandle.CURRENT);
         } finally {
             Binder.restoreCallingIdentity(token);
         }