summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2014-10-21 06:13:07 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2014-10-21 06:13:07 -0700
commit9a7ff1d3b21d3f211f6535bedbe2e58d01779e1c (patch)
treeb1266c606cfa34f528be9418262a34f2a8864252
parentad1f49bc28289fd21e507e0f247887330c92656b (diff)
parent7d28603cf6bd155df6120b73a7808a769890e078 (diff)
downloadandroid_hardware_qcom_bt-staging/cm-12.0-caf.tar.gz
android_hardware_qcom_bt-staging/cm-12.0-caf.tar.bz2
android_hardware_qcom_bt-staging/cm-12.0-caf.zip
Merge "Revert "Bluetooth: Enable controller logs by default""staging/cm-12.0-caf
-rw-r--r--libbt-vendor/src/hw_rome.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/libbt-vendor/src/hw_rome.c b/libbt-vendor/src/hw_rome.c
index 32e47c2..4925c14 100644
--- a/libbt-vendor/src/hw_rome.c
+++ b/libbt-vendor/src/hw_rome.c
@@ -1512,18 +1512,17 @@ error:
static void enable_controller_log (int fd)
{
int ret = 0;
- /* VS command to enable controller logging to the HOST. By default it is enabled */
- unsigned char cmd[6] = {0x01, 0x17, 0xFC, 0x02, 0x00, 0x01};
+ /* VS command to enable controller logging to the HOST. By default it is disabled */
+ unsigned char cmd[6] = {0x01, 0x17, 0xFC, 0x02, 0x00, 0x00};
unsigned char rsp[HCI_MAX_EVENT_SIZE];
char value[PROPERTY_VALUE_MAX] = {'\0'};
- property_get("enablebtsoclog", value, "0");
- //value at cmd[5]: 1 - to enable, 0 - to disable
- ret = (strcmp(value, "false") == 0) ? (cmd[5] = 0): (cmd[5] = 1);
+ property_get("enablebtsoclog", value, "false");
+
+ // value at cmd[5]: 1 - to enable, 0 - to disable
+ ret = (strcmp(value, "true") == 0) ? cmd[5] = 0x01: 0;
ALOGI("%s: %d", __func__, ret);
- if (ret) {
- property_set("enablebtsoclog", "true");
- }
+
ret = hci_send_vs_cmd(fd, (unsigned char *)cmd, rsp, 6);
if (ret != 6) {
ALOGE("%s: command failed", __func__);