summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSumit Bajpai <sbajpai@codeaurora.org>2014-11-26 16:42:18 +0530
committerGerrit - the friendly Code Review server <code-review@localhost>2014-11-27 22:17:46 -0800
commitc94f9c03db11b9e82d6c24a3197c60d5dfda4141 (patch)
treea43621100a85a5820903a241a8130713571e2b9c
parent66a8e70948dd3db3df0ef1508b8549614e072324 (diff)
downloadandroid_packages_apps_Bluetooth-c94f9c03db11b9e82d6c24a3197c60d5dfda4141.tar.gz
android_packages_apps_Bluetooth-c94f9c03db11b9e82d6c24a3197c60d5dfda4141.tar.bz2
android_packages_apps_Bluetooth-c94f9c03db11b9e82d6c24a3197c60d5dfda4141.zip
BT: Respond ATD request with OK if dialing success.
In case when remote sends CHLD command to put an active call on hold before dialing a new number, if call held update for 1st call comes before dialing update for 2nd call, then AG doesn't send any response to ATD. This may cause some carkits to behave bad. CRs-Fixed: 763260 Change-Id: Ie7735567eea139509aed13f750372cbf5b28f697
-rw-r--r--src/com/android/bluetooth/hfp/HeadsetStateMachine.java7
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 */