Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5178397f authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

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

Merge "Pass ApexSessionParams when submitting sessions to apex service." am: e340ecdc am: 359e9407

Change-Id: Idafa7a6abcc76a921c6e5f946f2e6bcdc3454f05
parents 702d1e27 359e9407

services/core/java/com/android/server/pm/ApexManager.java

+5 −1
Original line number Original line Diff line number Diff line
@@ -22,6 +22,7 @@ import android.annotation.Nullable; 
import android.apex.ApexInfo;

import android.apex.ApexInfo;

import android.apex.ApexInfoList;

import android.apex.ApexInfoList;

import android.apex.ApexSessionInfo;

import android.apex.ApexSessionInfo;

import android.apex.ApexSessionParams;

import android.apex.IApexService;

import android.apex.IApexService;

import android.content.BroadcastReceiver;

import android.content.BroadcastReceiver;

import android.content.Context;

import android.content.Context;
@@ -439,7 +440,10 @@ abstract class ApexManager { 
                throws PackageManagerException {

                throws PackageManagerException {

            try {

            try {

                final ApexInfoList apexInfoList = new ApexInfoList();

                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;

                return apexInfoList;

            } catch (RemoteException re) {

            } catch (RemoteException re) {

                Slog.e(TAG, "Unable to contact apexservice", re);

                Slog.e(TAG, "Unable to contact apexservice", re);

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

+2 −3
Original line number Original line Diff line number Diff line
@@ -183,7 +183,7 @@ public class ApexManagerTest { 
    public void testSubmitStagedSession_throwPackageManagerException() throws RemoteException {

    public void testSubmitStagedSession_throwPackageManagerException() throws RemoteException {

        doAnswer(invocation -> {

        doAnswer(invocation -> {

            throw new Exception();

            throw new Exception();

        }).when(mApexService).submitStagedSession(anyInt(), any(), any());

        }).when(mApexService).submitStagedSession(any(), any());





        assertThrows(PackageManagerException.class,

        assertThrows(PackageManagerException.class,

                () -> mApexManager.submitStagedSession(TEST_SESSION_ID, TEST_CHILD_SESSION_ID));

                () -> mApexManager.submitStagedSession(TEST_SESSION_ID, TEST_CHILD_SESSION_ID));
@@ -191,8 +191,7 @@ public class ApexManagerTest { 




    @Test

    @Test

    public void testSubmitStagedSession_throwRunTimeException() throws RemoteException {

    public void testSubmitStagedSession_throwRunTimeException() throws RemoteException {

        doThrow(RemoteException.class).when(mApexService).submitStagedSession(anyInt(), any(),

        doThrow(RemoteException.class).when(mApexService).submitStagedSession(any(), any());

                any());





        assertThrows(RuntimeException.class,

        assertThrows(RuntimeException.class,

                () -> mApexManager.submitStagedSession(TEST_SESSION_ID, TEST_CHILD_SESSION_ID));

                () -> mApexManager.submitStagedSession(TEST_SESSION_ID, TEST_CHILD_SESSION_ID));