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

Commit 7a22ea00 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Make onServiceDisconnected be called" into tm-qpr-dev

parents 5dc16174 ef7137c7

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 {