commit d5881211139834971d9475e27756abd2ad088b5d
author Linux Build Service Account <lnxbuild@localhost> Thu Aug 21 04:32:13 2014 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Aug 21 04:32:13 2014 -0700
tree 9d7f7e0e3611b0ee060b3a3ac2999e0656c58a44
parent 2b6bf5a7dd16eff87cf56f1cfcc02af3c9fb2270
parent 6979a7ad885fd6e0b297c67868950f856cf16815

Merge "Bluetooth-Wipower: Wipower handoff code."

libbt-vendor/src/bt_vendor_qcom.c

diff --git a/libbt-vendor/src/bt_vendor_qcom.c b/libbt-vendor/src/bt_vendor_qcom.c
index 1c3f40a..91da9fa 100644
--- a/libbt-vendor/src/bt_vendor_qcom.c
+++ b/libbt-vendor/src/bt_vendor_qcom.c
@@ -699,14 +699,10 @@
                                     ALOGE("userial_vendor_open returns err");
                                     retval = -1;
                                 } else {
-                                    /* Uncomment later
                                     property_get("ro.bluetooth.wipower", wipower_status, false);
-                                    The below property is added for test purpose will be later
-                                    disabled and above property will be used */
-                                    property_get("persist.bluetooth.wipower", wipower_status, false);
                                     if(strcmp(wipower_status, "true") == 0) {
                                        /* wait for embedded mode startup */
-                                        usleep(WAIT_TIMEOUT - (WAIT_TIMEOUT/4));
+                                        usleep(WAIT_TIMEOUT);
                                         check_embedded_mode(fd);
                                     } else {
                                         ALOGI("Wipower not enabled");

libbt-vendor/src/hw_rome.c

diff --git a/libbt-vendor/src/hw_rome.c b/libbt-vendor/src/hw_rome.c
index a84c42e..162fa10 100644
--- a/libbt-vendor/src/hw_rome.c
+++ b/libbt-vendor/src/hw_rome.c
@@ -1425,6 +1425,15 @@
         goto error;
     }
 
+    /* Read Command Complete Event - This is extra routine for ROME 1.0. From ROM 2.0, it should be removed. */
+    if (rsp[4] >= NON_WIPOWER_MODE) {
+        err = read_hci_event(fd, rsp, HCI_MAX_EVENT_SIZE);
+        if (err < 0) {
+            ALOGE("%s: Failed to get charging status", __FUNCTION__);
+            goto error;
+        }
+    }
+
 error:
     return err;
 }