diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2014-12-03 01:34:00 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-12-03 01:34:00 -0800 |
| commit | a04b0ed57e9019606864a2c26393313b28578bc7 (patch) | |
| tree | a43621100a85a5820903a241a8130713571e2b9c | |
| parent | 66a8e70948dd3db3df0ef1508b8549614e072324 (diff) | |
| parent | c94f9c03db11b9e82d6c24a3197c60d5dfda4141 (diff) | |
| download | android_packages_apps_Bluetooth-a04b0ed57e9019606864a2c26393313b28578bc7.tar.gz android_packages_apps_Bluetooth-a04b0ed57e9019606864a2c26393313b28578bc7.tar.bz2 android_packages_apps_Bluetooth-a04b0ed57e9019606864a2c26393313b28578bc7.zip | |
Merge "BT: Respond ATD request with OK if dialing success."
| -rw-r--r-- | src/com/android/bluetooth/hfp/HeadsetStateMachine.java | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/com/android/bluetooth/hfp/HeadsetStateMachine.java b/src/com/android/bluetooth/hfp/HeadsetStateMachine.java index 798aa1e58..0bec29172 100644 --- a/src/com/android/bluetooth/hfp/HeadsetStateMachine.java +++ b/src/com/android/bluetooth/hfp/HeadsetStateMachine.java @@ -3046,8 +3046,7 @@ final class HeadsetStateMachine extends StateMachine { mPhoneState.setCallState(callState.mCallState); mPhoneState.setNumber(callState.mNumber); mPhoneState.setType(callState.mType); - if (mDialingOut) { - if (callState.mCallState == + if (mDialingOut && callState.mCallState == HeadsetHalConstants.CALL_STATE_DIALING) { BluetoothDevice device = getDeviceForMessage(DIALING_OUT_TIMEOUT); if (device == null) { @@ -3056,11 +3055,7 @@ 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 */ |