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

Commit 4b5b9aa6 authored by Joseph Pirozzo's avatar Joseph Pirozzo Committed by android-build-merger
Browse files

Merge "Broadcast Disconnecting" am: ea0df7cc am: 5a40712e 

am: 96a22ce3

Change-Id: I835e409c359eeb98d80b15fa4f0fef57edda1d94
parents 3c0b5c58 96a22ce3

android/app/src/com/android/bluetooth/hfpclient/HeadsetClientStateMachine.java

+1 −5
Original line number Diff line number Diff line
@@ -1118,11 +1118,7 @@ public class HeadsetClientStateMachine extends StateMachine { 
                    if (!mCurrentDevice.equals(dev)) {

                        break;

                    }

                    if (NativeInterface.disconnectNative(getByteAddress(dev))) {

                        // No state transition is involved, fire broadcast immediately

                        broadcastConnectionState(dev, BluetoothProfile.STATE_DISCONNECTING,

                                BluetoothProfile.STATE_CONNECTED);

                    } else {

                    if (!NativeInterface.disconnectNative(getByteAddress(dev))) {

                        Log.e(TAG, "disconnectNative failed for " + dev);

                    }

                    break;