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

Commit ea9a7724 authored by Hyundo Moon's avatar Hyundo Moon Committed by Gerrit Code Review
Browse files

Merge "Make mServiceListener as null before calling onServiceDisconnected"

parents 4426c8e7 e07b56b4

framework/java/android/bluetooth/BluetoothHeadset.java

+2 −1
Original line number Diff line number Diff line
@@ -450,8 +450,9 @@ public final class BluetoothHeadset implements BluetoothProfile { 
        }



        if (mServiceListener != null) {

            mServiceListener.onServiceDisconnected(BluetoothProfile.HEADSET);

            ServiceListener listener = mServiceListener;

            mServiceListener = null;

            listener.onServiceDisconnected(BluetoothProfile.HEADSET);

        }

        doUnbind();

        mCloseGuard.close();

framework/java/android/bluetooth/BluetoothProfileConnector.java

+2 −1
Original line number Diff line number Diff line
@@ -189,8 +189,9 @@ public abstract class BluetoothProfileConnector<T> { 


    void disconnect() {

        if (mServiceListener != null) {

            mServiceListener.onServiceDisconnected(mProfileId);

            BluetoothProfile.ServiceListener listener = mServiceListener;

            mServiceListener = null;

            listener.onServiceDisconnected(mProfileId);

        }

        IBluetoothManager mgr = BluetoothAdapter.getDefaultAdapter().getBluetoothManager();

        if (mgr != null) {