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

Commit 903f6acc authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of [20271256] into tm-qpr1-release. 

Change-Id: Iac9e94e6dad2a084e0101d9765a53e7d3e887805
parents a9cf1566 24ec9768

framework/java/android/bluetooth/BluetoothHeadset.java

+1 −5
Original line number Diff line number Diff line
@@ -448,11 +448,7 @@ 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

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



    void disconnect() {

        if (mServiceListener != null) {

            mServiceListener.onServiceDisconnected(mProfileId);

        mServiceListener = null;

        }

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

        if (mgr != null) {

            try {