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

Commit e710db1b authored by Hyundo Moon's avatar Hyundo Moon Committed by Automerger Merge Worker
Browse files

Merge "Make mServiceListener as null before calling onServiceDisconnected" am: ea9a7724 

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



Change-Id: If7dae5ca3491c063d33c3d3f056fa11510d74c5d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 68b7ab20 ea9a7724

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) {