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

Commit 366e2bde authored by Sungsoo Lim's avatar Sungsoo Lim Committed by Gerrit Code Review
Browse files

Merge "Do not reset mAdapterService when stop()"

parents 402f2d0d ff644d39

android/app/src/com/android/bluetooth/pan/PanService.java

+0 −1
Original line number Diff line number Diff line
@@ -180,7 +180,6 @@ public class PanService extends ProfileService { 
            Log.w(TAG, "stop() called before start()");

            return true;

        }

        mAdapterService = null;

        if (mTetheringManager != null) {

            mTetheringManager.unregisterTetheringEventCallback(mTetheringCallback);

            mTetheringManager = null;

android/app/tests/unit/src/com/android/bluetooth/pan/PanServiceTest.java

+6 −0
Original line number Diff line number Diff line
@@ -150,6 +150,12 @@ public class PanServiceTest { 
        mService.onConnectStateChanged(REMOTE_DEVICE_ADDRESS_AS_ARRAY, 1, 2, 3, 4);

    }



    @Test

    public void onConnectStateChanged_doesNotCrashAfterStop() {

        mService.stop();

        mService.onConnectStateChanged(REMOTE_DEVICE_ADDRESS_AS_ARRAY, 1, 2, 3, 4);

    }



    @Test

    public void onControlStateChanged_doesNotCrash() {

        mService.onControlStateChanged(1, 2, 3, "ifname");