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

Commit a15d4fd4 authored by Hai Zhang's avatar Hai Zhang Committed by Amit Mahajan
Browse files

Remove permission internals from telephony tests. 

Test: presubmit
Bug: 175035926
Change-Id: I7d8fd7f0ad434027401085732b6a0facb2fca782
parent 22550d44

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

+0 −3
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ import android.net.Uri; 
import android.os.Looper;

import android.os.ParcelUuid;

import android.os.PersistableBundle;

import android.permission.IPermissionManager;

import android.service.euicc.EuiccProfileInfo;

import android.service.euicc.EuiccService;

import android.service.euicc.GetEuiccProfileInfoListResult;
@@ -109,8 +108,6 @@ public class SubscriptionInfoUpdaterTest extends TelephonyTest { 
    @Mock

    private IPackageManager mPackageManager;

    @Mock

    private IPermissionManager mPermissionManager;

    @Mock

    private UiccSlot mUiccSlot;



    /*Custom ContentProvider */

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

+1 −5
Original line number Diff line number Diff line
@@ -116,7 +116,6 @@ 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 com.android.server.pm.permission.PermissionManagerService;



import org.mockito.Mock;

import org.mockito.Mockito;
@@ -213,8 +212,6 @@ public abstract class TelephonyTest { 
    protected PackageManagerService mMockPackageManager;

    @Mock

    protected LegacyPermissionManagerService mMockLegacyPermissionManager;

    @Mock

    protected PermissionManagerService mMockPermissionManager;



    protected NetworkRegistrationInfo mNetworkRegistrationInfo =

            new NetworkRegistrationInfo.Builder()
@@ -659,8 +656,7 @@ public abstract class TelephonyTest { 
        mServiceManagerMockedServices.put("connectivity_metrics_logger", mConnMetLoggerBinder);

        mServiceManagerMockedServices.put("package", mMockPackageManager);

        mServiceManagerMockedServices.put("legacy_permission", mMockLegacyPermissionManager);

        mServiceManagerMockedServices.put("permissionmgr", mMockPermissionManager);

        logd("mMockPermissionManager replaced");

        logd("mMockLegacyPermissionManager replaced");

        doReturn(new int[]{AccessNetworkConstants.TRANSPORT_TYPE_WWAN,

                AccessNetworkConstants.TRANSPORT_TYPE_WLAN})

                .when(mTransportManager).getAvailableTransports();