Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Pass ApexSessionParams when submitting sessions to apex service." am: e340ecdc89 am: 359e940779

Browse Source 
Change-Id: Idafa7a6abcc76a921c6e5f946f2e6bcdc3454f05
This commit is contained in:
Automerger Merge Worker
2019-12-17 10:51:58 +00:00
parent 702d1e2708 359e940779
commit 5178397f50
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/pm/ApexManager.java
View File

@@ -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);

5
services/tests/servicestests/src/com/android/server/pm/ApexManagerTest.java
View File

@@ -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));