Bug 1203023 - Do not call Reset() for BluetoothMapSmsManager, r=tzimmermann
authorShawn Huang <shuang@mozilla.com>
Thu, 10 Sep 2015 17:10:04 +0800
changeset 261647 d59ea14e38a77451863f5854fc96e97519adbf37
parent 261646 5f16c6438bcf92576e4ae2c6b0c0218e0aeaa8d8
child 261648 c0e2d913c6017354c2c4ef2f6a56d5aac619511e
push id15125
push userphilringnalda@gmail.com
push dateThu, 10 Sep 2015 22:34:15 +0000
treeherderfx-team@0426cdc486e7 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstzimmermann
bugs1203023
milestone43.0a1
Bug 1203023 - Do not call Reset() for BluetoothMapSmsManager, r=tzimmermann
dom/bluetooth/bluedroid/BluetoothServiceBluedroid.cpp
--- a/dom/bluetooth/bluedroid/BluetoothServiceBluedroid.cpp
+++ b/dom/bluetooth/bluedroid/BluetoothServiceBluedroid.cpp
@@ -314,17 +314,18 @@ BluetoothServiceBluedroid::StopInternal(
     if (NS_WARN_IF(!sProfiles[i])) {
       BT_LOGR("Profile manager [%s] is null", profileName.get());
       return NS_ERROR_FAILURE;
     }
 
     if (sProfiles[i]->IsConnected()) {
       sProfiles[i]->Disconnect(nullptr);
     } else if (!profileName.EqualsLiteral("OPP") &&
-               !profileName.EqualsLiteral("PBAP")) {
+               !profileName.EqualsLiteral("PBAP") &&
+               !profileName.EqualsLiteral("MapSms")) {
       sProfiles[i]->Reset();
     }
   }
 
   // aRunnable will be a nullptr during starup and shutdown
   if (aRunnable) {
     mChangeAdapterStateRunnables.AppendElement(aRunnable);
   }