diff options
| author | Steve Kondik <steve@cyngn.com> | 2016-03-30 11:51:31 -0700 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2016-03-30 11:51:31 -0700 |
| commit | 8c5b9feba472e4532b6d151a402c8ad3ebd947a7 (patch) | |
| tree | 709589743ad8fd9e3dcfa2b0dbb5f8ba981ac16e /src/com/android/bluetooth/hfp/HeadsetStateMachine.java | |
| parent | d7199f6c73b0c927f694967163f33257d6e5199f (diff) | |
| parent | e6fae29795ff64060044d89bb6213f13042008ff (diff) | |
| download | android_packages_apps_Bluetooth-8c5b9feba472e4532b6d151a402c8ad3ebd947a7.tar.gz android_packages_apps_Bluetooth-8c5b9feba472e4532b6d151a402c8ad3ebd947a7.tar.bz2 android_packages_apps_Bluetooth-8c5b9feba472e4532b6d151a402c8ad3ebd947a7.zip | |
Merge branch 'LA.BF.1.1.3_rb1.11' of git://codeaurora.org/platform/packages/apps/Bluetooth into cm-13.0
Diffstat (limited to 'src/com/android/bluetooth/hfp/HeadsetStateMachine.java')
| -rw-r--r-- | src/com/android/bluetooth/hfp/HeadsetStateMachine.java | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/com/android/bluetooth/hfp/HeadsetStateMachine.java b/src/com/android/bluetooth/hfp/HeadsetStateMachine.java index d7bf4a85d..bacdaf82d 100644 --- a/src/com/android/bluetooth/hfp/HeadsetStateMachine.java +++ b/src/com/android/bluetooth/hfp/HeadsetStateMachine.java @@ -832,11 +832,6 @@ final class HeadsetStateMachine extends StateMachine { private class Connected extends State { @Override public void enter() { - // Remove pending connection attempts that were deferred during the pending - // state. This is to prevent auto connect attempts from disconnecting - // devices that previously successfully connected. - // TODO: This needs to check for multiple HFP connections, once supported... - removeDeferredMessages(CONNECT); Log.d(TAG, "Enter Connected: " + getCurrentMessage().what + ", size: " + mConnectedDevicesList.size()); // start phone state listener here so that the CIND response as part of SLC can be @@ -3129,11 +3124,6 @@ final class HeadsetStateMachine extends StateMachine { } atResponseCodeNative(HeadsetHalConstants.AT_RESPONSE_OK, 0, getByteAddress(device)); - removeMessages(DIALING_OUT_TIMEOUT); - } else if (callState.mCallState == - HeadsetHalConstants.CALL_STATE_ACTIVE || callState.mCallState - == HeadsetHalConstants.CALL_STATE_IDLE) { - mDialingOut = false; } /* Set ActiveScoDevice to null when call ends */ |