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

Commit d7404d2e authored by Myles Watson's avatar Myles Watson
Browse files

ProfileServiceTest: Call AdapterService.initNative 

Bug: 70585142
Test: runtest bluetooth \
     -c com.android.bluetooth.btservice.ProfileServiceTest
Change-Id: I20977120fcf5e0fa835bd286ef851d92850143ea
parent c35f5abc

android/app/src/com/android/bluetooth/btservice/AdapterService.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -2572,9 +2572,9 @@ public class AdapterService extends Service { 




    private static native void classInitNative();

    private static native void classInitNative();





    private native boolean initNative();

    native boolean initNative();





    private native void cleanupNative();

    native void cleanupNative();





    /*package*/

    /*package*/

    native boolean enableNative(boolean startRestricted);

    native boolean enableNative(boolean startRestricted);

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

+3 −0
Original line number Original line Diff line number Diff line
@@ -84,6 +84,8 @@ public class ProfileServiceTest { 




        mProfiles = Config.getSupportedProfiles();

        mProfiles = Config.getSupportedProfiles();





        mMockAdapterService.initNative();



        TestUtils.setAdapterService(mMockAdapterService);

        TestUtils.setAdapterService(mMockAdapterService);





        Assert.assertNotNull(AdapterService.getAdapterService());

        Assert.assertNotNull(AdapterService.getAdapterService());
@@ -92,6 +94,7 @@ public class ProfileServiceTest { 
    @After

    @After

    public void tearDown()

    public void tearDown()

            throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {

            throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {

        mMockAdapterService.cleanupNative();

        TestUtils.clearAdapterService(mMockAdapterService);

        TestUtils.clearAdapterService(mMockAdapterService);

        mMockAdapterService = null;

        mMockAdapterService = null;

        mProfiles = null;

        mProfiles = null;