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

Commit 15f8a16f authored by Winson's avatar Winson
Browse files

Fix TelephonyTest for IPackageManager isolation 

This interface was moved such that PackageManagerService no longer
implements it. Instead, mock IPackageManager.Stub directly.

Bug: 217961172

Test: atest com.android.internal.telephony

Change-Id: I96ba19d20adb8215103756c2be7c725378d0bb36
parent 09db5fd1

tests/telephonytests/src/com/android/internal/telephony/TelephonyTest.java

+3 −3
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ import android.content.IIntentSender; 
import android.content.Intent;

import android.content.SharedPreferences;

import android.content.pm.ApplicationInfo;

import android.content.pm.IPackageManager;

import android.content.pm.PackageInfo;

import android.content.pm.PackageManager;

import android.location.LocationManager;
@@ -128,7 +129,6 @@ import com.android.internal.telephony.uicc.UiccController; 
import com.android.internal.telephony.uicc.UiccPort;

import com.android.internal.telephony.uicc.UiccProfile;

import com.android.internal.telephony.uicc.UiccSlot;

import com.android.server.pm.PackageManagerService;

import com.android.server.pm.permission.LegacyPermissionManagerService;



import org.mockito.Mockito;
@@ -204,7 +204,7 @@ public abstract class TelephonyTest { 
    protected ImsEcbm mImsEcbm;

    protected SubscriptionController mSubscriptionController;

    protected ServiceState mServiceState;

    protected PackageManagerService mMockPackageManager;

    protected IPackageManager.Stub mMockPackageManager;

    protected LegacyPermissionManagerService mMockLegacyPermissionManager;

    protected SimulatedCommandsVerifier mSimulatedCommandsVerifier;

    protected InboundSmsHandler mInboundSmsHandler;
@@ -438,7 +438,7 @@ public abstract class TelephonyTest { 
        mImsEcbm = Mockito.mock(ImsEcbm.class);

        mSubscriptionController = Mockito.mock(SubscriptionController.class);

        mServiceState = Mockito.mock(ServiceState.class);

        mMockPackageManager = Mockito.mock(PackageManagerService.class);

        mMockPackageManager = Mockito.mock(IPackageManager.Stub.class);

        mMockLegacyPermissionManager = Mockito.mock(LegacyPermissionManagerService.class);

        mSimulatedCommandsVerifier = Mockito.mock(SimulatedCommandsVerifier.class);

        mInboundSmsHandler = Mockito.mock(InboundSmsHandler.class);