Bug 804474 - Null address value in system message of "bluetooth-hfp-status-changed". r=qdot, a=blocking-basecamp

dom/bluetooth/BluetoothHfpManager.cpp

@@ -321,14 +321,16 @@ BluetoothHfpManager::NotifySettings()
   type.AssignLiteral("bluetooth-hfp-status-changed");
 
   name.AssignLiteral("connected");
-  uint32_t status = GetConnectionStatus();
+  if (GetConnectionStatus() == SocketConnectionStatus::SOCKET_CONNECTED) {
-  v = status;
+    v = true;
+  } else {
+    v = false;
+  }
   parameters.AppendElement(BluetoothNamedValue(name, v));
 
   name.AssignLiteral("address");
-  nsString address;
+  GetSocketAddr(mDevicePath);
-  GetSocketAddr(address);
+  v = mDevicePath;
-  v = address;
   parameters.AppendElement(BluetoothNamedValue(name, v));
 
   if (!BroadcastSystemMessage(type, parameters)) {
@@ -835,12 +837,14 @@ BluetoothHfpManager::CallStateChanged(int aCallIndex, int aCallState,
 void
 BluetoothHfpManager::OnConnectSuccess()
 {
+  // Cache device path for NotifySettings() since we can't get socket address
+  // when a headset disconnect with us
+  GetSocketAddr(mDevicePath);
+
   if (mCurrentCallState == nsIRadioInterfaceLayer::CALL_STATE_CONNECTED ||
       mCurrentCallState == nsIRadioInterfaceLayer::CALL_STATE_DIALING ||
       mCurrentCallState == nsIRadioInterfaceLayer::CALL_STATE_ALERTING) {
-    nsString address;
+    OpenScoSocket(mDevicePath);
-    GetSocketAddr(address);
-    OpenScoSocket(address);
   }
 
   NotifySettings();

dom/bluetooth/BluetoothHfpManager.h

@@ -54,6 +54,7 @@ private:
   int mCurrentCallIndex;
   int mCurrentCallState;
   bool mReceiveVgsFlag;
+  nsString mDevicePath;
   nsAutoPtr<BluetoothRilListener> mListener;
 };