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

Backout 033a0cdb8c03 (Bug 818353) due to causing bug 929815.

Browse Source
This commit is contained in:
Dave Hylands 2013-10-22 21:12:04 -07:00
parent 0e2d2de05f
commit 07b91f5537
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dom/bluetooth/BluetoothHfpManager.cpp
View File

@ -561,8 +561,7 @@ BluetoothHfpManager::HandleVoiceConnectionChanged()
NS_ENSURE_TRUE_VOID(connection);
nsCOMPtr<nsIDOMMozMobileConnectionInfo> voiceInfo;
// TODO: Bug 921991 - B2G BT: support multiple sim cards
connection->GetVoiceConnectionInfo(0, getter_AddRefs(voiceInfo));
connection->GetVoiceConnectionInfo(getter_AddRefs(voiceInfo));
NS_ENSURE_TRUE_VOID(voiceInfo);
nsString type;
@ -598,8 +597,7 @@ BluetoothHfpManager::HandleVoiceConnectionChanged()
* - manual: set mNetworkSelectionMode to 1 (manual)
*/
nsString mode;
// TODO: Bug 921991 - B2G BT: support multiple sim cards
connection->GetNetworkSelectionMode(0, mode);
connection->GetNetworkSelectionMode(mode);
if (mode.EqualsLiteral("manual")) {
mNetworkSelectionMode = 1;
} else {

6
dom/bluetooth/BluetoothRilListener.cpp
View File

@ -292,9 +292,8 @@ BluetoothRilListener::StartMobileConnectionListening()
do_GetService(NS_RILCONTENTHELPER_CONTRACTID);
NS_ENSURE_TRUE(provider, false);
// TODO: Bug 921991 - B2G BT: support multiple sim cards
nsresult rv = provider->
RegisterMobileConnectionMsg(0, mMobileConnectionListener);
RegisterMobileConnectionMsg(mMobileConnectionListener);
return NS_SUCCEEDED(rv);
}
@ -305,9 +304,8 @@ BluetoothRilListener::StopMobileConnectionListening()
do_GetService(NS_RILCONTENTHELPER_CONTRACTID);
NS_ENSURE_TRUE(provider, false);
// TODO: Bug 921991 - B2G BT: support multiple sim cards
nsresult rv = provider->
UnregisterMobileConnectionMsg(0, mMobileConnectionListener);
UnregisterMobileConnectionMsg(mMobileConnectionListener);
return NS_SUCCEEDED(rv);
}