Bug 1065336: Implement Bluetooth backend selection; use daemon by default, r=shawnjohnjr
authorThomas Zimmermann <tdz@users.sourceforge.net>
Tue, 20 Jan 2015 10:05:45 +0100
changeset 224645 9abbd96020cd027288066eeb2b763dc7cec7a189
parent 224644 f0d42391b5fda82d961064ad2e56df6f12199cc0
child 224646 a57a98519f43bb7ce5de371587cbbb8dded1cc96
push id28141
push userryanvm@gmail.com
push dateWed, 21 Jan 2015 01:32:10 +0000
treeherdermozilla-central@b736f3018a05 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersshawnjohnjr
bugs1065336
milestone38.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
Bug 1065336: Implement Bluetooth backend selection; use daemon by default, r=shawnjohnjr This patch adds proper selection of the Bluetooth backend. The backend is configurable via environment property 'ro.moz.bluetooth.backend'. The default value is bluetoothd. On systems that are not Android 4.2 or later, the code does not return a backend. These systems should use BlueZ instead.
dom/bluetooth/BluetoothInterface.cpp
--- a/dom/bluetooth/BluetoothInterface.cpp
+++ b/dom/bluetooth/BluetoothInterface.cpp
@@ -1,15 +1,18 @@
 /* -*- Mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; tab-width: 40 -*- */
 /* vim: set ts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "BluetoothInterface.h"
+#if ANDROID_VERSION >= 17
+#include <cutils/properties.h>
+#endif
 #ifdef MOZ_B2G_BT_BLUEDROID
 #include "BluetoothHALInterface.h"
 #endif
 #ifdef MOZ_B2G_BT_DAEMON
 #include "BluetoothDaemonInterface.h"
 #endif
 
 BEGIN_BLUETOOTH_NAMESPACE
@@ -86,30 +89,70 @@ BluetoothNotificationHandler::~Bluetooth
 { }
 
 // Interface
 //
 
 BluetoothInterface*
 BluetoothInterface::GetInstance()
 {
+#if ANDROID_VERSION >= 17
+  /* We pick a default backend from the available ones. The branches
+   * are ordered by preference.
+   */
+#ifdef MOZ_B2G_BT_DAEMON
+  static const char sDefaultBackend[] = "bluetoothd";
+#else
+#ifdef MOZ_B2G_BT_BLUEDROID
+  static const char sDefaultBackend[] = "bluedroid";
+#else
+  static const char const * sDefaultBackend = nullptr;
+#endif
+#endif
+
   /* Here's where we decide which implementation to use. Currently
    * there is only Bluedroid and the Bluetooth daemon, but others are
    * possible. Having multiple interfaces built-in and selecting the
-   * correct one at runtime could also be an option.
+   * correct one at runtime is also an option.
    */
+
+  char value[PROPERTY_VALUE_MAX];
+  int len;
+
+  len = property_get("ro.moz.bluetooth.backend", value, sDefaultBackend);
+  if (len < 0) {
+    BT_WARNING("No Bluetooth backend available.");
+    return nullptr;
+  }
+
+  const nsDependentCString backend(value, len);
+
 #ifdef MOZ_B2G_BT_BLUEDROID
-  return BluetoothHALInterface::GetInstance();
+  if (backend.LowerCaseEqualsLiteral("bluedroid")) {
+    return BluetoothHALInterface::GetInstance();
+  } else
+#endif
+#ifdef MOZ_B2G_BT_DAEMON
+  if (backend.LowerCaseEqualsLiteral("bluetoothd")) {
+    return BluetoothDaemonInterface::GetInstance();
+  } else
+#endif
+  {
+    BT_WARNING("Bluetooth backend '%s' is unknown or not available.",
+               backend.get());
+  }
+  return nullptr;
+
 #else
-#ifdef MOZ_B2G_BT_DAEMON
-  return BluetoothDaemonInterface::GetInstance();
-#else
+  /* Anything that's not Android 4.2 or later uses BlueZ instead. The
+   * code should actually never reach this point.
+   */
+  BT_WARNING("No Bluetooth backend available for your system.");
   return nullptr;
 #endif
-#endif
 }
 
 BluetoothInterface::BluetoothInterface()
 { }
 
 BluetoothInterface::~BluetoothInterface()
 { }