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

Commit de410b7d authored by Sungsoo Lim's avatar Sungsoo Lim Committed by Automerger Merge Worker
Browse files

Merge "Do not reset mAdapterService when stop()" am: 366e2bde 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2582955



Change-Id: I13712f258cca620352ea811069c1549a68788c17
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c0087529 366e2bde

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");