merge b2g-inbound to mozilla-central

b2g/config/gaia.json

@@ -1,4 +1,4 @@
 {
-    "revision": "7c0504882446706ff1c1baa09607cfb91616a3c6", 
+    "revision": "89c57a31cebe0d8d94cbce4bcb47788b18f4fe84", 
     "repo_path": "/integration/gaia-central"
 }

dom/bluetooth/BluetoothService.cpp

@@ -153,6 +153,10 @@ public:
       return NS_OK;
     }
 
+    // Update mEnabled of BluetoothService object since
+    // StartInternal/StopInternal have been already done.
+    gBluetoothService->SetEnabled(mEnabled);
+
     nsAutoString signalName;
     signalName = mEnabled ? NS_LITERAL_STRING("Enabled")
                           : NS_LITERAL_STRING("Disabled");
@@ -208,10 +212,6 @@ public:
       }
     }
 
-    // Update mEnabled of BluetoothService object since
-    // StartInternal/StopInternal have been already done.
-    gBluetoothService->SetEnabled(mEnabled);
-
     // This is requested in Bug 836516. With settings this property, WLAN
     // firmware could be aware of Bluetooth has been turned on/off, so that the
     // mecahnism of handling coexistence of WIFI and Bluetooth could be started.