diff options
| author | Ravi Nagarajan <nravi@broadcom.com> | 2012-03-08 23:57:33 +0530 |
|---|---|---|
| committer | Matthew Xie <mattx@google.com> | 2012-07-14 11:19:12 -0700 |
| commit | e2197423bcf1a93c620be13d458a9da6693fa94d (patch) | |
| tree | bb73c290e824fe47e0ea1caddab0aeee23fa48f6 /btif/src | |
| parent | 17706aa42214addb95ee4aea5177a8784960dfc1 (diff) | |
| download | external_bluetooth_bluedroid-e2197423bcf1a93c620be13d458a9da6693fa94d.zip external_bluetooth_bluedroid-e2197423bcf1a93c620be13d458a9da6693fa94d.tar.gz external_bluetooth_bluedroid-e2197423bcf1a93c620be13d458a9da6693fa94d.tar.bz2 | |
PTS fixes: Add quotes for number in CLIP, remove index 4 from CHLD, re-define the call state values to match CLCC
Change-Id: If8cfcca226fa0aea1cd65ebd852bb02316041f4b
Diffstat (limited to 'btif/src')
| -rw-r--r-- | btif/src/btif_hf.c | 11 | ||||
| -rw-r--r-- | btif/src/btif_util.c | 4 |
2 files changed, 9 insertions, 6 deletions
diff --git a/btif/src/btif_hf.c b/btif/src/btif_hf.c index f78ccd4..14e677f 100644 --- a/btif/src/btif_hf.c +++ b/btif/src/btif_hf.c @@ -824,10 +824,10 @@ static bt_status_t phone_state_change(int num_active, int num_held, bthf_call_st CHECK_BTHF_INIT(); - BTIF_TRACE_DEBUG6("phone_state_change: num_active=%d[%d] num_held=%d[%d]"\ - " call_setup=%d [%d]", num_active, btif_hf_cb.num_active, + BTIF_TRACE_DEBUG6("phone_state_change: num_active=%d [prev: %d] num_held=%d[prev: %d]"\ + " call_setup=%s [prev: %s]", num_active, btif_hf_cb.num_active, num_held, btif_hf_cb.num_held, - call_setup_state, btif_hf_cb.call_setup_state); + dump_hf_call_state(call_setup_state), dump_hf_call_state(btif_hf_cb.call_setup_state)); /* Check what has changed and update the corresponding indicators. ** In ad @@ -895,7 +895,10 @@ static bt_status_t phone_state_change(int num_active, int num_held, bthf_call_st res = BTA_AG_IN_CALL_RES; if (number) { - strcpy(ag_res.str, number); + if ((type == BTHF_CALL_ADDRTYPE_INTERNATIONAL) && (*number != '+')) + sprintf (ag_res.str, "\"+%s\"", number); + else + sprintf (ag_res.str, "\"%s\"", number); ag_res.num = type; } break; diff --git a/btif/src/btif_util.c b/btif/src/btif_util.c index ad3ba86..bfa489b 100644 --- a/btif/src/btif_util.c +++ b/btif/src/btif_util.c @@ -287,14 +287,14 @@ const char* dump_hf_call_state(bthf_call_state_t call_state) switch(call_state) { CASE_RETURN_STR(BTHF_CALL_STATE_IDLE) - CASE_RETURN_STR(BTHF_CALL_STATE_ONHOLD) + CASE_RETURN_STR(BTHF_CALL_STATE_HELD) CASE_RETURN_STR(BTHF_CALL_STATE_DIALING) CASE_RETURN_STR(BTHF_CALL_STATE_ALERTING) CASE_RETURN_STR(BTHF_CALL_STATE_INCOMING) CASE_RETURN_STR(BTHF_CALL_STATE_WAITING) CASE_RETURN_STR(BTHF_CALL_STATE_ACTIVE) default: - return "UNKNOWN MSG ID"; + return "UNKNOWN CALL STATE"; } } |