diff options
| -rw-r--r-- | services/core/java/com/android/server/pm/ApexManager.java | 6 | ||||
| -rw-r--r-- | services/tests/servicestests/src/com/android/server/pm/ApexManagerTest.java | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/services/core/java/com/android/server/pm/ApexManager.java b/services/core/java/com/android/server/pm/ApexManager.java index 12e8069ecae5..cf5ec05a73a7 100644 --- a/services/core/java/com/android/server/pm/ApexManager.java +++ b/services/core/java/com/android/server/pm/ApexManager.java @@ -22,6 +22,7 @@ import android.annotation.Nullable; import android.apex.ApexInfo; import android.apex.ApexInfoList; import android.apex.ApexSessionInfo; +import android.apex.ApexSessionParams; import android.apex.IApexService; import android.content.BroadcastReceiver; import android.content.Context; @@ -439,7 +440,10 @@ abstract class ApexManager { throws PackageManagerException { try { final ApexInfoList apexInfoList = new ApexInfoList(); - mApexService.submitStagedSession(sessionId, childSessionIds, apexInfoList); + ApexSessionParams params = new ApexSessionParams(); + params.sessionId = sessionId; + params.childSessionIds = childSessionIds; + mApexService.submitStagedSession(params, apexInfoList); return apexInfoList; } catch (RemoteException re) { Slog.e(TAG, "Unable to contact apexservice", re); diff --git a/services/tests/servicestests/src/com/android/server/pm/ApexManagerTest.java b/services/tests/servicestests/src/com/android/server/pm/ApexManagerTest.java index 6bb4202fa759..143dc28f57d1 100644 --- a/services/tests/servicestests/src/com/android/server/pm/ApexManagerTest.java +++ b/services/tests/servicestests/src/com/android/server/pm/ApexManagerTest.java @@ -183,7 +183,7 @@ public class ApexManagerTest { public void testSubmitStagedSession_throwPackageManagerException() throws RemoteException { doAnswer(invocation -> { throw new Exception(); - }).when(mApexService).submitStagedSession(anyInt(), any(), any()); + }).when(mApexService).submitStagedSession(any(), any()); assertThrows(PackageManagerException.class, () -> mApexManager.submitStagedSession(TEST_SESSION_ID, TEST_CHILD_SESSION_ID)); @@ -191,8 +191,7 @@ public class ApexManagerTest { @Test public void testSubmitStagedSession_throwRunTimeException() throws RemoteException { - doThrow(RemoteException.class).when(mApexService).submitStagedSession(anyInt(), any(), - any()); + doThrow(RemoteException.class).when(mApexService).submitStagedSession(any(), any()); assertThrows(RuntimeException.class, () -> mApexManager.submitStagedSession(TEST_SESSION_ID, TEST_CHILD_SESSION_ID)); |