Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-14 05:45:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 993288 - Separate BTHF_CALL_STATE_INCOMING and BTHF_CALL_STATE_WAITING for CLCC response only, for other cases, use BTHF_CALL_STATE_INCOMING for both states. r=echou

Browse Source
This commit is contained in:
Jocelyn Liu 2014-04-17 16:55:45 +08:00
parent 4cab710e6a
commit 326e43c775
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dom/bluetooth/bluedroid/hfp/BluetoothHfpManager.cpp
View File

@ -964,6 +964,11 @@ BluetoothHfpManager::SendCLCC(Call& aCall, int aIndex)
BTHF_CALL_STATE_ACTIVE;
}
if (callState == BTHF_CALL_STATE_INCOMING &&
FindFirstCall(nsITelephonyProvider::CALL_STATE_CONNECTED)) {
callState = BTHF_CALL_STATE_WAITING;
}
bt_status_t status = sBluetoothHfpInterface->clcc_response(
aIndex,
aCall.mDirection,
@ -1067,9 +1072,7 @@ BluetoothHfpManager::ConvertToBthfCallState(int aCallState)
// Refer to AOSP BluetoothPhoneService.convertCallState
if (aCallState == nsITelephonyProvider::CALL_STATE_INCOMING) {
state = (FindFirstCall(nsITelephonyProvider::CALL_STATE_CONNECTED)) ?
BTHF_CALL_STATE_WAITING :
BTHF_CALL_STATE_INCOMING;
state = BTHF_CALL_STATE_INCOMING;
} else if (aCallState == nsITelephonyProvider::CALL_STATE_DIALING) {
state = BTHF_CALL_STATE_DIALING;
} else if (aCallState == nsITelephonyProvider::CALL_STATE_ALERTING) {