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

Commit ff644d39 authored by Sungsoo Lim's avatar Sungsoo Lim
Browse files

Do not reset mAdapterService when stop() 

Bug: 273363306
Test: atest PanServiceTest
Change-Id: I7322ef0556b96d2d03abe4b407e0e761306b285f
parent e343113f

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

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

            Log.w(TAG, "stop() called before start()");

            return true;

            return true;

        }

        }

        mAdapterService = null;

        if (mTetheringManager != null) {

        if (mTetheringManager != null) {

            mTetheringManager.unregisterTetheringEventCallback(mTetheringCallback);

            mTetheringManager.unregisterTetheringEventCallback(mTetheringCallback);

            mTetheringManager = null;

            mTetheringManager = null;

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

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

        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

    @Test

    public void onControlStateChanged_doesNotCrash() {

    public void onControlStateChanged_doesNotCrash() {

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

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