diff options
| author | En-Shuo Hsu <enshuo@chromium.org> | 2020-04-27 18:35:40 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-05-06 14:18:16 +0000 |
| commit | 864e5386249f4aad687fd786f34ce18f07212177 (patch) | |
| tree | 547458ce40630d42d6f3645d394bb729d350331b | |
| parent | 5c154596f0caa557ac50641376d006471b0e7712 (diff) | |
| download | adhd-864e5386249f4aad687fd786f34ce18f07212177.tar.gz | |
CRAS: Disable support for Enhanced Driver Status
This CL partially revert chromium:2126847 as it is actually not required
for passing the PTS test after we set
TSPX_HFP_Supported_HF_Indicator_1=2 and
TSPX_HFP_Illegal_HF_Indicator_Value_1=-1
BUG=b:149188379
TEST=Run HFP/AG/SLC/BV-09-I, HFI/BV-02-1 and HFI/BI-03-1
Change-Id: I8254af8bf3aa867b7bb1cf156168da62e8aaabd7
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/adhd/+/2168973
Tested-by: En-Shuo Hsu <enshuo@chromium.org>
Auto-Submit: En-Shuo Hsu <enshuo@chromium.org>
Reviewed-by: Hsinyu Chao <hychao@chromium.org>
Commit-Queue: En-Shuo Hsu <enshuo@chromium.org>
| -rw-r--r-- | cras/src/server/cras_hfp_slc.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/cras/src/server/cras_hfp_slc.c b/cras/src/server/cras_hfp_slc.c index f716baca..25284174 100644 --- a/cras/src/server/cras_hfp_slc.c +++ b/cras/src/server/cras_hfp_slc.c @@ -692,7 +692,7 @@ static int indicator_support(struct hfp_slc_handle *handle, const char *cmd) * For the list of HF indicator assigned number, you can * check the Bluetooth SIG Assigned Numbers web page. */ - err = hfp_send(handle, AT_CMD("+BIND: (1,2)")); + err = hfp_send(handle, AT_CMD("+BIND: (2)")); if (err < 0) return err; } @@ -723,13 +723,6 @@ static int indicator_support(struct hfp_slc_handle *handle, const char *cmd) * 1 = enabled, value changes may be sent for this indicator */ - /* We support 1:enhanced driver status but disable it just for - * passing PTS test case HFP/AG/SLC/BV-09-I - */ - err = hfp_send(handle, AT_CMD("+BIND: 1,0")); - if (err < 0) - return err; - err = hfp_send(handle, AT_CMD("+BIND: 2,1")); if (err < 0) return err; @@ -754,9 +747,8 @@ static int indicator_state_change(struct hfp_slc_handle *handle, char *tokens, *key, *val; int level; /* AT+BIEV= <assigned number>,<value> (Update value of indicator) - * We only care about battery level, which is with assigned number 2. - * The valid value for battery level should be 0 ~ 100 defined by the - * spec. + * CRAS only supports battery level, which is with assigned number 2. + * Battery level should range from 0 to 100 defined by the spec. */ tokens = strdup(cmd); strtok(tokens, "="); @@ -783,6 +775,7 @@ static int indicator_state_change(struct hfp_slc_handle *handle, "Get invalid battery status from cmd:%s", cmd); } } + free(tokens); return hfp_send(handle, AT_CMD("OK")); |