wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 863620 - Followup of bug 848414, r=echou

Browse Source
This commit is contained in:
Gina Yeh 2013-04-19 14:40:51 +02:00
parent dfd861b9ac
commit c1d82b4506
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
dom/bluetooth/BluetoothHfpManager.cpp
View File

@ -786,13 +786,6 @@ BluetoothHfpManager::ReceiveSocketData(BluetoothSocket* aSocket,
goto respond_with_ok;
}
char chld = atCommandValues[0][0];
if (chld < '0' || chld > '4') {
NS_WARNING("Wrong value of command [AT+CHLD]");
SendLine("ERROR");
return;
}
/**
* The following two cases are supported:
* AT+CHLD=1 - Releases active calls and accepts the other (held or
@ -805,19 +798,26 @@ BluetoothHfpManager::ReceiveSocketData(BluetoothSocket* aSocket,
* Please see 4.33.2 in Bluetooth hands-free profile 1.6 for more
* information.
*/
// No idx shall be included
char chld = atCommandValues[0][0];
bool valid = true;
if (atCommandValues[0].Length() > 1) {
SendLine("ERROR");
return;
}
if (chld == '1') {
NS_WARNING("No index should be included in command [AT+CHLD]");
valid = false;
} else if (chld == '0' || chld == '3' || chld == '4') {
NS_WARNING("The value of command [AT+CHLD] is not supported");
valid = false;
} else if (chld == '1') {
NotifyDialer(NS_LITERAL_STRING("CHUP+ATA"));
} else if (chld == '2') {
NotifyDialer(NS_LITERAL_STRING("CHLD+ATA"));
} else {
NS_WARNING("Not handling chld value");
NS_WARNING("Wrong value of command [AT+CHLD]");
valid = false;
}
if (!valid) {
SendLine("ERROR");
return;
}
} else if (msg.Find("AT+VGS=") != -1) {
// Adjust volume by headset