From 8e609e94df35f464f67853c343edd8ab7c9fa064 Mon Sep 17 00:00:00 2001
From: Weizhung Ding <weizhungding@google.com>
Date: Fri, 27 Oct 2023 02:40:00 +0000
Subject: [PATCH] Revert "Remove field from
getSdkSandboxApplicationInfoForInstrum..."
Revert submission 25159737-unflagged_api
Reason for revert: b/307905132
Reverted changes: /q/submissionid:25159737-unflagged_api
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d667b5b861b42ab07827ead537c7b77d80af1422)
Merged-In: Id8cf259eb8f7ec04e0587a3cae2f32f11a0fbdb6
Change-Id: Id8cf259eb8f7ec04e0587a3cae2f32f11a0fbdb6
---
.../core/java/com/android/server/am/ActivityManagerService.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index 210c18d78c23c..e88d0c6baf268 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -15934,7 +15934,7 @@ public class ActivityManagerService extends IActivityManager.Stub
try {
sdkSandboxInfo =
sandboxManagerLocal.getSdkSandboxApplicationInfoForInstrumentation(
- sdkSandboxClientAppInfo, isSdkInSandbox);
+ sdkSandboxClientAppInfo, userId, isSdkInSandbox);
} catch (NameNotFoundException e) {
reportStartInstrumentationFailureLocked(
watcher, className, "Can't find SdkSandbox package");
--
GitLab