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

Commit f3da54f2 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Make onServiceDisconnected be called" am: ebc7f793 

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



Change-Id: Ie4a04d9f268641b766f3751c78ef076c092c0995
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4b1c0943 ebc7f793

framework/java/android/bluetooth/BluetoothHeadset.java

+5 −1
Original line number Diff line number Diff line
@@ -448,7 +448,11 @@ public final class BluetoothHeadset implements BluetoothProfile { 
                Log.e(TAG, "", re);

            }

        }



        if (mServiceListener != null) {

            mServiceListener.onServiceDisconnected(BluetoothProfile.HEADSET);

            mServiceListener = null;

        }

        doUnbind();

        mCloseGuard.close();

    }

framework/java/android/bluetooth/BluetoothProfileConnector.java

+4 −1
Original line number Diff line number Diff line
@@ -188,7 +188,10 @@ public abstract class BluetoothProfileConnector<T> { 
    }



    void disconnect() {

        if (mServiceListener != null) {

            mServiceListener.onServiceDisconnected(mProfileId);

            mServiceListener = null;

        }

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

        if (mgr != null) {

            try {