Bug 859727 - Remove routing logic from BluetoothScoManager, r=echou, r=rlin
authorGina Yeh <gyeh@mozilla.com>
Thu, 18 Apr 2013 17:41:17 +0200
changeset 129189 996520044b849fc8229899b0b2097c56e115699d
parent 129188 b4f4d4749b998836e34b3be0d150784fb9525b60
child 129190 9c118c313eda0e71ba17e82ca1c91a9613638498
push idunknown
push userunknown
push dateunknown
reviewersechou, rlin
bugs859727
milestone23.0a1
Bug 859727 - Remove routing logic from BluetoothScoManager, r=echou, r=rlin
dom/bluetooth/BluetoothScoManager.cpp
--- a/dom/bluetooth/BluetoothScoManager.cpp
+++ b/dom/bluetooth/BluetoothScoManager.cpp
@@ -78,23 +78,21 @@ BluetoothScoManager::NotifyAudioManager(
     do_GetService("@mozilla.org/telephony/audiomanager;1");
   NS_ENSURE_TRUE_VOID(am);
 
   if (aAddress.IsEmpty()) {
     if (NS_FAILED(obs->NotifyObservers(nullptr, BLUETOOTH_SCO_STATUS_CHANGED, nullptr))) {
       NS_WARNING("Failed to notify bluetooth-sco-status-changed observsers!");
       return;
     }
-    am->SetForceForUse(am->USE_COMMUNICATION, am->FORCE_NONE);
   } else {
     if (NS_FAILED(obs->NotifyObservers(nullptr, BLUETOOTH_SCO_STATUS_CHANGED, aAddress.BeginReading()))) {
       NS_WARNING("Failed to notify bluetooth-sco-status-changed observsers!");
       return;
     }
-    am->SetForceForUse(am->USE_COMMUNICATION, am->FORCE_BT_SCO);
   }
 }
 
 NS_IMPL_ISUPPORTS1(BluetoothScoManagerObserver, nsIObserver)
 
 namespace {
 StaticAutoPtr<BluetoothScoManager> gBluetoothScoManager;
 StaticRefPtr<BluetoothScoManagerObserver> sScoObserver;