From 5fa86d65980fbf295f5819755f9a551d918c2bd8 Mon Sep 17 00:00:00 2001 From: Jocelyn Liu Date: Mon, 11 May 2015 03:44:00 -0400 Subject: [PATCH] Bug 1162910 - Make bluetooth daemon as the default backend of BT APIv2. r=tzimmermann --- dom/bluetooth/BluetoothInterface.cpp | 9 --------- 1 file changed, 9 deletions(-) diff --git a/dom/bluetooth/BluetoothInterface.cpp b/dom/bluetooth/BluetoothInterface.cpp index 26f217eb86d2..a51cf65dfb0f 100644 --- a/dom/bluetooth/BluetoothInterface.cpp +++ b/dom/bluetooth/BluetoothInterface.cpp @@ -138,20 +138,11 @@ BluetoothInterface::GetInstance() */ static const char* const sDefaultBackend[] = { -#if MOZ_B2G_BT_API_V2 -#ifdef MOZ_B2G_BT_BLUEDROID - "bluedroid", -#endif -#ifdef MOZ_B2G_BT_DAEMON - "bluetoothd", -#endif -#else #ifdef MOZ_B2G_BT_DAEMON "bluetoothd", #endif #ifdef MOZ_B2G_BT_BLUEDROID "bluedroid", -#endif #endif nullptr // no default backend; must be final element in array };