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

Commit 679f5dd9 authored by William Escande's avatar William Escande
Browse files

HearingAidService: stop calling NativeInterface in test 

Bug: 295237486
Test: atest HearingAidServiceTest
Change-Id: Ica77beacad3b95e4928a249717453c50fb3b770c
parent 46ff10fe

android/app/src/com/android/bluetooth/hearingaid/HearingAidNativeInterface.java

+14 −1
Original line number Diff line number Diff line
@@ -39,11 +39,16 @@ public class HearingAidNativeInterface { 


    @GuardedBy("INSTANCE_LOCK")

    private static HearingAidNativeInterface sInstance;



    private static final Object INSTANCE_LOCK = new Object();



    static {

        if (Utils.isInstrumentationTestMode()) {

            Log.w(TAG, "App is instrumented. Skip loading the native");

        } else {

            classInitNative();

        }

    }



    private HearingAidNativeInterface() {

        mAdapter = BluetoothAdapter.getDefaultAdapter();
@@ -64,6 +69,14 @@ public class HearingAidNativeInterface { 
        }

    }



    /** Set singleton instance. */

    @VisibleForTesting

    public static void setInstance(HearingAidNativeInterface instance) {

        synchronized (INSTANCE_LOCK) {

            sInstance = instance;

        }

    }



    /**

     * Initializes the native interface.

     *

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

+4 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ import com.android.bluetooth.TestUtils; 
import com.android.bluetooth.a2dp.A2dpNativeInterface;

import com.android.bluetooth.btservice.storage.DatabaseManager;

import com.android.bluetooth.gatt.GattService;

import com.android.bluetooth.hearingaid.HearingAidNativeInterface;

import com.android.bluetooth.pan.PanNativeInterface;



import org.junit.After;
@@ -85,6 +86,7 @@ public class ProfileServiceTest { 
    }



    @Mock private A2dpNativeInterface mA2dpNativeInterface;

    @Mock private HearingAidNativeInterface mHearingAidNativeInterface;

    @Mock private PanNativeInterface mPanNativeInterface;



    private void setAllProfilesState(int state, int invocationNumber) throws TimeoutException {
@@ -166,6 +168,7 @@ public class ProfileServiceTest { 
                new String[0], false, "");

        mMockAdapterService.enableNative();

        A2dpNativeInterface.setInstance(mA2dpNativeInterface);

        HearingAidNativeInterface.setInstance(mHearingAidNativeInterface);

        PanNativeInterface.setInstance(mPanNativeInterface);

    }
@@ -179,6 +182,7 @@ public class ProfileServiceTest { 
        mMockAdapterService = null;

        mProfiles = null;

        A2dpNativeInterface.setInstance(null);

        HearingAidNativeInterface.setInstance(null);

        PanNativeInterface.setInstance(null);

    }

android/app/tests/unit/src/com/android/bluetooth/hearingaid/HearingAidServiceTest.java

+2 −1
Original line number Diff line number Diff line
@@ -104,8 +104,8 @@ public class HearingAidServiceTest { 
        doReturn(true, false).when(mAdapterService).isStartedProfile(anyString());



        mAdapter = BluetoothAdapter.getDefaultAdapter();

        HearingAidNativeInterface.setInstance(mNativeInterface);

        startService();

        mService.mHearingAidNativeInterface = mNativeInterface;

        mService.mAudioManager = mAudioManager;

        mServiceBinder = (HearingAidService.BluetoothHearingAidBinder) mService.initBinder();

        mServiceBinder.mIsTesting = true;
@@ -137,6 +137,7 @@ public class HearingAidServiceTest { 
    @After

    public void tearDown() throws Exception {

        stopService();

        HearingAidNativeInterface.setInstance(null);

        mTargetContext.unregisterReceiver(mHearingAidIntentReceiver);

        mHearingAidIntentReceiver.clear();

        mDeviceQueueMap.clear();