commit 2588cd802f322650ed737dfb7a10e9ad94064e99
author The Android Automerger <android-build@android.com> Tue Nov 01 06:46:38 2011 -0700
committer The Android Automerger <android-build@android.com> Tue Nov 01 06:46:38 2011 -0700
tree 57c539323286b47eb1050dd5cfb942c74d184695
parent 62432dd0bb4d59f640bde9309f86eef2fd984f18
parent af0d8c6b6c8fc52a542fe2dbb206ec3d297a6ef7

merge in ics-mr1-release history after reset to ics-mr1

bluedroid/bluetooth.c

diff --git a/bluedroid/bluetooth.c b/bluedroid/bluetooth.c
index 252bdc4..4cc9204 100644
--- a/bluedroid/bluetooth.c
+++ b/bluedroid/bluetooth.c
@@ -168,11 +168,17 @@
         if (hci_sock < 0) goto out;
 
         ret = ioctl(hci_sock, HCIDEVUP, HCI_DEV_ID);
+
+        LOGI("bt_enable: ret: %d, errno: %d", ret, errno);
         if (!ret) {
             break;
+        } else if (errno == EALREADY) {
+            LOGW("Bluetoothd already started, unexpectedly!");
+            break;
         }
+
         close(hci_sock);
-        usleep(10000);  // 10 ms retry delay
+        usleep(100000);  // 100 ms retry delay
     }
     if (attempt == 0) {
         LOGE("%s: Timeout waiting for HCI device to come up, error- %d, ",