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

Commit a4725ad5 authored by Myles Watson's avatar Myles Watson Committed by android-build-merger
Browse files

Merge changes Ia873b2c1,I20977120 

am: f4a0456f

Change-Id: I74176c04b319c4ba76b3b126f4382dcd17bde3cc
parents 35d48d73 f4a0456f

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

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


    private static native void classInitNative();



    private native boolean initNative();

    native boolean initNative();



    private native void cleanupNative();

    native void cleanupNative();



    /*package*/

    native boolean enableNative(boolean startRestricted);

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

+1 −0
Original line number Diff line number Diff line
@@ -126,6 +126,7 @@ public class AdapterServiceTest { 
    @After

    public void tearDown() {

        mAdapterService.cleanup();

        Config.init(InstrumentationRegistry.getTargetContext());

    }



    /**

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

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


        mProfiles = Config.getSupportedProfiles();



        mMockAdapterService.initNative();



        TestUtils.setAdapterService(mMockAdapterService);



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

    public void tearDown()

            throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {

        mMockAdapterService.cleanupNative();

        TestUtils.clearAdapterService(mMockAdapterService);

        mMockAdapterService = null;

        mProfiles = null;