Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-16 13:56:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1096194 - Responding Enhanced call control with ERROR if enhanced call control is not supported, r=btian

Browse Source
This commit is contained in:
Shawn Huang 2014-11-12 11:15:21 +08:00
parent a3ba9b4cb5
commit 042f661de2
2 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -65,6 +65,12 @@ IsValidDtmf(const char aChar) {
(aChar >= 'A' && aChar <= 'D'); (aChar >= 'A' && aChar <= 'D');
} }
static bool
IsSupportedChld(const int aChld) {
// We currently only support CHLD=0~3.
return (aChld >= 0 && aChld <= 3);
}
class BluetoothHfpManager::GetVolumeTask : public nsISettingsServiceCallback class BluetoothHfpManager::GetVolumeTask : public nsISettingsServiceCallback
{ {
public: public:
@ -1420,6 +1426,13 @@ BluetoothHfpManager::CallHoldNotification(BluetoothHandsfreeCallHoldType aChld)
{ {
MOZ_ASSERT(NS_IsMainThread()); MOZ_ASSERT(NS_IsMainThread());
if (!IsSupportedChld((int)aChld)) {
// We currently don't support Enhanced Call Control.
// AT+CHLD=1x and AT+CHLD=2x will be ignored
SendResponse(HFP_AT_RESPONSE_ERROR);
return;
}
SendResponse(HFP_AT_RESPONSE_OK); SendResponse(HFP_AT_RESPONSE_OK);
nsAutoCString message("CHLD="); nsAutoCString message("CHLD=");

13
dom/bluetooth2/bluedroid/hfp/BluetoothHfpManager.cpp
View File

@ -62,6 +62,12 @@ IsValidDtmf(const char aChar) {
(aChar >= 'A' && aChar <= 'D'); (aChar >= 'A' && aChar <= 'D');
} }
static bool
IsSupportedChld(const int aChld) {
// We currently only support CHLD=0~3.
return (aChld >= 0 && aChld <= 3);
}
class BluetoothHfpManager::GetVolumeTask MOZ_FINAL : public nsISettingsServiceCallback class BluetoothHfpManager::GetVolumeTask MOZ_FINAL : public nsISettingsServiceCallback
{ {
public: public:
@ -1411,6 +1417,13 @@ BluetoothHfpManager::CallHoldNotification(BluetoothHandsfreeCallHoldType aChld)
{ {
MOZ_ASSERT(NS_IsMainThread()); MOZ_ASSERT(NS_IsMainThread());
if (!IsSupportedChld((int)aChld)) {
// We currently don't support Enhanced Call Control.
// AT+CHLD=1x and AT+CHLD=2x will be ignored
SendResponse(HFP_AT_RESPONSE_ERROR);
return;
}
SendResponse(HFP_AT_RESPONSE_OK); SendResponse(HFP_AT_RESPONSE_OK);
nsAutoCString message("CHLD="); nsAutoCString message("CHLD=");