From: Andrei Emeltchenko <andrei.emeltchenko@xxxxxxxxx>
Hangup Call Command notification callback has new parameter bdaddr.
Currently use global device bdaddr.
---
android/hal-handsfree.c | 9 ++++++++-
android/hal-ipc-api.txt | 2 +-
android/hal-msg.h | 3 +++
android/handsfree.c | 5 ++++-
4 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/android/hal-handsfree.c b/android/hal-handsfree.c
index 01663ec..ccd30a1 100644
--- a/android/hal-handsfree.c
+++ b/android/hal-handsfree.c
@@ -80,8 +80,15 @@ static void handle_answer(void *buf, uint16_t len, int fd)
static void handle_hangup(void *buf, uint16_t len, int fd)
{
- if (cbs->hangup_call_cmd_cb)
+ if (cbs->hangup_call_cmd_cb) {
+#if ANDROID_VERSION > PLATFORM_VER(4, 4, 4)
+ struct hal_ev_handsfree_hangup *ev = buf;
+
+ cbs->hangup_call_cmd_cb((bt_bdaddr_t *) (ev->bdaddr));
+#else
cbs->hangup_call_cmd_cb();
+#endif
+ }
}
static void handle_volume(void *buf, uint16_t len, int fd)
diff --git a/android/hal-ipc-api.txt b/android/hal-ipc-api.txt
index cfde814..8a77b06 100644
--- a/android/hal-ipc-api.txt
+++ b/android/hal-ipc-api.txt
@@ -1019,7 +1019,7 @@ Notifications:
Opcode 0x85 - Hangup Call Command notification
- Notification parameters: <none>
+ Notification parameters: Remote address (6 octets)
Opcode 0x86 - Volume Command notification
diff --git a/android/hal-msg.h b/android/hal-msg.h
index 195e26c..0abbb1f7 100644
--- a/android/hal-msg.h
+++ b/android/hal-msg.h
@@ -1355,6 +1355,9 @@ struct hal_ev_handsfree_answer {
} __attribute__((packed));
#define HAL_EV_HANDSFREE_HANGUP 0x85
+struct hal_ev_handsfree_hangup {
+ uint8_t bdaddr[6];
+} __attribute__((packed));
#define HAL_EV_HANDSFREE_VOLUME 0x86
struct hal_ev_handsfree_volume {
diff --git a/android/handsfree.c b/android/handsfree.c
index 26d01bb..d31b14a 100644
--- a/android/handsfree.c
+++ b/android/handsfree.c
@@ -596,6 +596,7 @@ static void at_cmd_chup(struct hfp_gw_result *result, enum hfp_gw_cmd_type type,
void *user_data)
{
struct hf_device *dev = user_data;
+ struct hal_ev_handsfree_hangup ev;
DBG("");
@@ -604,8 +605,10 @@ static void at_cmd_chup(struct hfp_gw_result *result, enum hfp_gw_cmd_type type,
if (hfp_gw_result_has_next(result))
break;
+ bdaddr2android(&dev->bdaddr, ev.bdaddr);
+
ipc_send_notif(hal_ipc, HAL_SERVICE_ID_HANDSFREE,
- HAL_EV_HANDSFREE_HANGUP, 0, NULL);
+ HAL_EV_HANDSFREE_HANGUP, sizeof(ev), &ev);
/* Framework is not replying with result for AT+CHUP */
hfp_gw_send_result(dev->gw, HFP_RESULT_OK);
--
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
