commit 8bf5a42475a68788d0ab2b75b4c0d8e68b85ad8e
author Sandro Montanari <sandrom@google.com> Fri Oct 27 14:02:27 2023 +0000
committer Sandro Montanari <sandrom@google.com> Wed Nov 01 10:35:21 2023 +0000
tree 0bd87fa2792e7edda221694c165605ed09cd526b
parent 1822ab1745a9369d6866e5455a8abdc75b30ee27

Remove parameter from getSdkSandboxApplicationInfoForInstrumentation

The userId parameter is redundant, it can be extracted from the
ApplicationInfo.

Flag: TEST_ONLY
Bug: 306689945
Test: atest SdkSandboxManagerServiceUnitTest SdkSandboxInstrumentationTest
Change-Id: Ibbcaa7368c6a1776e454fcdbb384ac8e3433fe68

services/core/java/com/android/server/am/ActivityManagerService.java

diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index d61dd75..88bb66f 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -15947,7 +15947,7 @@
         try {
             sdkSandboxInfo =
                     sandboxManagerLocal.getSdkSandboxApplicationInfoForInstrumentation(
-                            sdkSandboxClientAppInfo, userId, isSdkInSandbox);
+                            sdkSandboxClientAppInfo, isSdkInSandbox);
         } catch (NameNotFoundException e) {
             reportStartInstrumentationFailureLocked(
                     watcher, className, "Can't find SdkSandbox package");