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

Commit 24ec9768 authored by Hyundo Moon's avatar Hyundo Moon Committed by Android Build Coastguard Worker
Browse files

Revert "Make onServiceDisconnected be called" 

Revert "Add tests for BluetoothProfile.close"

Revert submission 19938469-BluetoothProfile_close

Reason for revert: Creating a revert CL only for QPR1
Reverted Changes:
I51ad4e0ec:Make onServiceDisconnected be called
Ic5188c62e:Add tests for BluetoothProfile.close

Bug: 249213217
Change-Id: Id180e12f1dc6da48f68797a70c3095e6bf444a21
(cherry picked from commit b773c175d566085f4bdf2a0e629882535131c50e)
Merged-In: Id180e12f1dc6da48f68797a70c3095e6bf444a21
parent a9cf1566

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 {