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

Commit 2d13069b authored by Hansong Zhang's avatar Hansong Zhang
Browse files

Revert "Add test mock for PermissionCheckerManager" 

This reverts commit 14ced7c4.

Reason for revert: we already have https://googleplex-android-review.git.corp.google.com/c/platform/packages/apps/Bluetooth/+/14822485/

Bug: 190330212
Test: AdapterServiceTest
Change-Id: I0b7c3a3b3e752b8437bf3c3b9feb9baa353cfa80
parent 571cc979

android/app/tests/unit/src/com/android/bluetooth/btservice/AdapterServiceTest.java

+0 −10
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ import android.bluetooth.BluetoothAdapter; 
import android.bluetooth.BluetoothDevice;

import android.bluetooth.IBluetoothCallback;

import android.content.AttributionSource;

import android.content.AttributionSourceState;

import android.content.Context;

import android.content.pm.ApplicationInfo;

import android.content.pm.PackageManager;
@@ -97,7 +96,6 @@ public class AdapterServiceTest { 
    private @Mock Binder mBinder;

    private @Mock AudioManager mAudioManager;

    private @Mock android.app.Application mApplication;

    private @Mock PermissionCheckerManager mMockPermissionCheckerManager;



    private static final int CONTEXT_SWITCH_MS = 100;

    private static final int PROFILE_SERVICE_TOGGLE_TIME_MS = 200;
@@ -205,14 +203,6 @@ public class AdapterServiceTest { 
        // Wait for any async events to drain

        InstrumentationRegistry.getInstrumentation().waitForIdleSync();



        doReturn(Context.PERMISSION_CHECKER_SERVICE).when(mMockContext)

                .getSystemServiceName(PermissionCheckerManager.class);

        when(mMockContext.getSystemService(Context.PERMISSION_CHECKER_SERVICE))

                .thenReturn(mMockPermissionCheckerManager);

        when(mMockPermissionCheckerManager.checkPermission(anyString(),

                any(AttributionSourceState.class),

                anyString(), anyBoolean(), anyBoolean(),

                anyBoolean(), anyInt())).thenReturn(PackageManager.PERMISSION_GRANTED);

        mServiceBinder.registerCallback(mIBluetoothCallback, mAttributionSource);



        Config.init(mMockContext);