Bug 802428: Support varying adapter properties based on android version; r=ggrisco r=echou

--HG--
extra : rebase_source : 7e469ae48df6aef480e882e196ee901c27702aa8

dom/bluetooth/linux/BluetoothDBusService.cpp

@@ -43,6 +43,9 @@
 #include "mozilla/ipc/RawDBusConnection.h"
 #include "mozilla/Util.h"
 #include "mozilla/dom/bluetooth/BluetoothTypes.h"
+#if defined(MOZ_WIDGET_GONK)
+#include "cutils/properties.h"
+#endif
 
 /**
  * Some rules for dealing with memory in DBus:
@@ -76,6 +79,8 @@ USING_BLUETOOTH_NAMESPACE
 #define BLUEZ_DBUS_BASE_IFC       "org.bluez"
 #define BLUEZ_ERROR_IFC           "org.bluez.Error"
 
+#define PROP_DEVICE_CONNECTED_TYPE "org.bluez.device.conn.type"
+
 typedef struct {
   const char* name;
   int type;
@@ -88,7 +93,7 @@ static Properties sDeviceProperties[] = {
   {"Class", DBUS_TYPE_UINT32},
   {"UUIDs", DBUS_TYPE_ARRAY},
   {"Paired", DBUS_TYPE_BOOLEAN},
-  {"Connected", DBUS_TYPE_BOOLEAN},
+  {"Connected", DBUS_TYPE_ARRAY},
   {"Trusted", DBUS_TYPE_BOOLEAN},
   {"Blocked", DBUS_TYPE_BOOLEAN},
   {"Alias", DBUS_TYPE_STRING},
@@ -870,6 +875,49 @@ GetIntCallback(DBusMessage* aMsg, void* aBluetoothReplyRunnable)
                   UnpackIntMessage);
 }
 
+bool
+IsDeviceConnectedTypeBoolean()
+{
+#if defined(MOZ_WIDGET_GONK)
+
+  char connProp[PROPERTY_VALUE_MAX];
+
+  property_get(PROP_DEVICE_CONNECTED_TYPE, connProp, "array");
+  if (strcmp(connProp, "boolean") == 0) {
+    return true;
+  }
+  return false;
+#else
+  // Assume it's always a boolean on desktop. Fixing someday in Bug 806457.
+  return true;
+#endif
+}
+
+void
+CopyProperties(Properties* inProp, Properties* outProp, int aPropertyTypeLen)
+{
+  int i;
+
+  for (i = 0; i < aPropertyTypeLen; i++) {
+    outProp[i].name = inProp[i].name;
+    outProp[i].type = inProp[i].type;
+  }
+}
+
+int
+GetPropertyIndex(Properties* prop, const char* propertyName,
+                 int aPropertyTypeLen)
+{
+  int i;
+
+  for (i = 0; i < aPropertyTypeLen; i++) {
+    if (!strncmp(propertyName, prop[i].name, strlen(propertyName))) {
+      return i;
+    }
+  }
+  return -1;
+}
+
 bool
 GetProperty(DBusMessageIter aIter, Properties* aPropertyTypes,
             int aPropertyTypeLen, int* aPropIndex,
@@ -1037,14 +1085,43 @@ UnpackAdapterPropertiesMessage(DBusMessage* aMsg, DBusError* aErr,
                           ArrayLength(sAdapterProperties));
 }
 
+bool
+ReplaceConnectedType(Properties* sourceProperties, Properties** destProperties, int aPropertyTypeLen)
+{
+  if (!IsDeviceConnectedTypeBoolean()) {
+    return false;
+  }
+  *destProperties = (Properties *) malloc(sizeof(Properties) * aPropertyTypeLen);
+  if (*destProperties) {
+    CopyProperties(sourceProperties, *destProperties, aPropertyTypeLen);
+    int index = GetPropertyIndex(*destProperties, "Connected", aPropertyTypeLen);
+    if (index >= 0) {
+      (*destProperties)[index].type = DBUS_TYPE_BOOLEAN;
+      return true;
+    } else {
+      free(*destProperties);
+    }
+  }
+  return false;
+}
+
 void
 UnpackDevicePropertiesMessage(DBusMessage* aMsg, DBusError* aErr,
                               BluetoothValue& aValue,
                               nsAString& aErrorStr)
 {
+  Properties* props = sDeviceProperties;
+  Properties* newProps;
+  bool replaced = ReplaceConnectedType(sDeviceProperties, &newProps, ArrayLength(sDeviceProperties));
+  if (replaced) {
+     props = newProps;
+  }
   UnpackPropertiesMessage(aMsg, aErr, aValue, aErrorStr,
-                          sDeviceProperties,
+                          props,
                           ArrayLength(sDeviceProperties));
+  if (replaced) {
+     free(newProps);
+  }
 }
 
 void
@@ -1192,11 +1269,20 @@ EventFilter(DBusConnection* aConn, DBusMessage* aMsg, void* aData)
     dbus_message_iter_get_basic(&iter, &addr);
 
     if (dbus_message_iter_next(&iter)) {
+      Properties* props = sDeviceProperties;
+      Properties* newProps;
+      bool replaced = ReplaceConnectedType(sDeviceProperties, &newProps, ArrayLength(sDeviceProperties));
+      if (replaced) {
+        props = newProps;
+      }
       ParseProperties(&iter,
                       v,
                       errorStr,
-                      sDeviceProperties,
+                      props,
                       ArrayLength(sDeviceProperties));
+      if (replaced) {
+        free(newProps);
+      }
       if (v.type() == BluetoothValue::TArrayOfBluetoothNamedValue)
       {
         // The DBus DeviceFound message actually passes back a key value object
@@ -1269,11 +1355,20 @@ EventFilter(DBusConnection* aConn, DBusMessage* aMsg, void* aData)
                         sAdapterProperties,
                         ArrayLength(sAdapterProperties));
   } else if (dbus_message_is_signal(aMsg, DBUS_DEVICE_IFACE, "PropertyChanged")) {
+    Properties* props = sDeviceProperties;
+    Properties* newProps;
+    bool replaced = ReplaceConnectedType(sDeviceProperties, &newProps, ArrayLength(sDeviceProperties));
+    if (replaced) {
+      props = newProps;
+    }
     ParsePropertyChange(aMsg,
                         v,
                         errorStr,
-                        sDeviceProperties,
+                        props,
                         ArrayLength(sDeviceProperties));
+    if (replaced) {
+      free(newProps);
+    }
     if (v.get_ArrayOfBluetoothNamedValue()[0].name().EqualsLiteral("Paired")) {
       // transfer signal to BluetoothService and
       // broadcast system message of bluetooth-pairingstatuschanged