Merge mozilla-central into mozilla-inbound
authorEhsan Akhgari <ehsan@mozilla.com>
Mon, 05 Nov 2012 21:50:43 -0500
changeset 112379 2e888de576a82f1e653599069e73234cbcfd2bfb
parent 112378 cecdb284a108dec4ef5a35846fdc11251a3d7442 (current diff)
parent 112304 f9c2c266e7aacd337d1bdda02af37481bc35170a (diff)
child 112380 ecf0c2a7cb9f41240f167c902119054d56fd495e
push id23812
push useremorley@mozilla.com
push dateTue, 06 Nov 2012 14:01:34 +0000
treeherdermozilla-central@f4aeed115e54 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone19.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Merge mozilla-central into mozilla-inbound
--- a/dom/bluetooth/linux/BluetoothDBusService.cpp
+++ b/dom/bluetooth/linux/BluetoothDBusService.cpp
@@ -874,20 +874,19 @@ GetIntCallback(DBusMessage* aMsg, void* 
   RunDBusCallback(aMsg, aBluetoothReplyRunnable,
                   UnpackIntMessage);
 }
 
 bool
 IsDeviceConnectedTypeBoolean()
 {
 #if defined(MOZ_WIDGET_GONK)
-
   char connProp[PROPERTY_VALUE_MAX];
 
-  property_get(PROP_DEVICE_CONNECTED_TYPE, connProp, "array");
+  property_get(PROP_DEVICE_CONNECTED_TYPE, connProp, "boolean");
   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