diff options
| author | Kiran Kelageri <kkelageri@codeaurora.org> | 2014-07-16 18:21:05 -0700 |
|---|---|---|
| committer | Kiran Kelageri <kkelageri@codeaurora.org> | 2014-08-08 17:42:51 -0700 |
| commit | 6979a7ad885fd6e0b297c67868950f856cf16815 (patch) | |
| tree | 0eb8cd6d15d3b45b04631996284e6c59ae89e8eb | |
| parent | a1d91d1b9ab51a0e8874b82a157497d301070047 (diff) | |
| download | android_hardware_qcom_bt-6979a7ad885fd6e0b297c67868950f856cf16815.tar.gz android_hardware_qcom_bt-6979a7ad885fd6e0b297c67868950f856cf16815.tar.bz2 android_hardware_qcom_bt-6979a7ad885fd6e0b297c67868950f856cf16815.zip | |
Bluetooth-Wipower: Wipower handoff code.
Wipower handoff code chages for L-Release
Change-Id: Ie28b6022431413c2bb8e627335175e10deebd825
CRs-fixed: 698314
| -rw-r--r-- | libbt-vendor/src/bt_vendor_qcom.c | 6 | ||||
| -rw-r--r-- | libbt-vendor/src/hw_rome.c | 9 |
2 files changed, 10 insertions, 5 deletions
diff --git a/libbt-vendor/src/bt_vendor_qcom.c b/libbt-vendor/src/bt_vendor_qcom.c index b3602e6..48c92f9 100644 --- a/libbt-vendor/src/bt_vendor_qcom.c +++ b/libbt-vendor/src/bt_vendor_qcom.c @@ -693,14 +693,10 @@ static int op(bt_vendor_opcode_t opcode, void *param) 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"); 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 @@ int rome_wipower_current_charging_status_req(int fd) 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; } |