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

Commit 25b87cd5 authored by Rongxuan Liu's avatar Rongxuan Liu Committed by Gerrit Code Review
Browse files

Merge "Add null check in mActiveDeviceManager cleanup" into main

parents 0dcc5eb5 c98bb6b0

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

+3 −1
Original line number Diff line number Diff line
@@ -191,7 +191,9 @@ public class ActiveDeviceManagerTest { 
    public void tearDown() throws Exception {

        mTestLooper.stopAutoDispatchAndIgnoreExceptions();

        BluetoothMethodProxy.setInstanceForTesting(null);

        if (mActiveDeviceManager != null) {

            mActiveDeviceManager.cleanup();

        }

        TestUtils.clearAdapterService(mAdapterService);

        Utils.setDualModeAudioStateForTesting(mOriginalDualModeAudioState);

    }