commit 8d2fef3fa40e01380774f47fb5741c0ad4d5a93a
author Joe Onorato <joeo@google.com> Fri Aug 17 00:16:43 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Aug 17 00:16:43 2012 -0700
tree ccf054a6259b2d0c7efa2dccf3e15fc3aa4d91ca
parent b507c8eac3052e6fc94dfea3be2e5e6fa86f1487
parent 658c98723518f124ea534d022ef7ed8fc7c68f33

am 658c9872: Merge "host modules don\'t need LOCAL_MODULE_TAGS"

* commit '658c98723518f124ea534d022ef7ed8fc7c68f33':
  host modules don't need LOCAL_MODULE_TAGS

bluedroid/Android.mk

diff --git a/bluedroid/Android.mk b/bluedroid/Android.mk
index 17df49b..d372947 100644
--- a/bluedroid/Android.mk
+++ b/bluedroid/Android.mk
@@ -6,6 +6,14 @@
 
 include $(CLEAR_VARS)
 
+ifeq ($(BOARD_BLUETOOTH_DOES_NOT_USE_RFKILL),true)
+  LOCAL_CFLAGS := $(LOCAL_CFLAGS) -DBLUETOOTH_DOES_NOT_USE_RFKILL
+endif
+
+ifeq ($(BOARD_BLUETOOTH_USES_HCIATTACH_PROPERTY),true)
+  LOCAL_CFLAGS := $(LOCAL_CFLAGS) -DBLUETOOTH_HCIATTACH_USING_PROPERTY
+endif
+
 LOCAL_SRC_FILES := \
 	bluetooth.c
 

bluedroid/bluetooth.c

diff --git a/bluedroid/bluetooth.c b/bluedroid/bluetooth.c
index 3ad2189..1eef5dc 100644
--- a/bluedroid/bluetooth.c
+++ b/bluedroid/bluetooth.c
@@ -45,7 +45,7 @@
 static int rfkill_id = -1;
 static char *rfkill_state_path = NULL;
 
-
+#ifndef BLUETOOTH_DOES_NOT_USE_RFKILL
 static int init_rfkill() {
     char path[64];
     char buf[16];
@@ -136,6 +136,7 @@
     if (fd >= 0) close(fd);
     return ret;
 }
+#endif
 
 static inline int create_hci_sock() {
     int sk = socket(AF_BLUETOOTH, SOCK_RAW, BTPROTO_HCI);
@@ -153,12 +154,22 @@
     int hci_sock = -1;
     int attempt;
 
+#ifndef BLUETOOTH_DOES_NOT_USE_RFKILL
     if (set_bluetooth_power(1) < 0) goto out;
+#endif
 
+#ifndef BLUETOOTH_HCIATTACH_USING_PROPERTY
     ALOGI("Starting hciattach daemon");
-    if (property_set("ctl.start", "hciattach") < 0) {
+    if (property_set("ctl.start", "hciattach") < 0)
+#else
+    ALOGI("Enable hci tranport");
+    if (property_set("bluetooth.hciattach", "true") < 0)
+#endif
+    {
         ALOGE("Failed to start hciattach");
+#ifndef BLUETOOTH_DOES_NOT_USE_RFKILL
         set_bluetooth_power(0);
+#endif
         goto out;
     }
 
@@ -189,14 +200,18 @@
         if (property_set("ctl.stop", "hciattach") < 0) {
             ALOGE("Error stopping hciattach");
         }
+#ifndef BLUETOOTH_DOES_NOT_USE_RFKILL
         set_bluetooth_power(0);
+#endif
         goto out;
     }
 
     ALOGI("Starting bluetoothd deamon");
     if (property_set("ctl.start", "bluetoothd") < 0) {
         ALOGE("Failed to start bluetoothd");
+#ifndef BLUETOOTH_DOES_NOT_USE_RFKILL
         set_bluetooth_power(0);
+#endif
         goto out;
     }
 
@@ -224,15 +239,23 @@
     if (hci_sock < 0) goto out;
     ioctl(hci_sock, HCIDEVDOWN, HCI_DEV_ID);
 
+#ifndef BLUETOOTH_HCIATTACH_USING_PROPERTY
     ALOGI("Stopping hciattach deamon");
-    if (property_set("ctl.stop", "hciattach") < 0) {
+    if (property_set("ctl.stop", "hciattach") < 0)
+#else
+    ALOGI("Disable hci tranport");
+    if (property_set("bluetooth.hciattach", "false") < 0)
+#endif
+    {
         ALOGE("Error stopping hciattach");
         goto out;
     }
 
+#ifndef BLUETOOTH_DOES_NOT_USE_RFKILL
     if (set_bluetooth_power(0) < 0) {
         goto out;
     }
+#endif
     ret = 0;
 
 out:
@@ -248,9 +271,11 @@
     struct hci_dev_info dev_info;
 
 
+#ifndef BLUETOOTH_DOES_NOT_USE_RFKILL
     // Check power first
     ret = check_bluetooth_power();
     if (ret == -1 || ret == 0) goto out;
+#endif
 
     ret = -1;