Compilation fix: N-MR1 merge

Change-Id: I345c84222923f4497297178f14a649496623a5fc

diff --git a/bta/ag/bta_ag_act.c b/bta/ag/bta_ag_act.c
index 6da8a3f..fb0de76 100644 (file)
--- a/bta/ag/bta_ag_act.c
+++ b/bta/ag/bta_ag_act.c
@@ -456,9 +456,6 @@ void bta_ag_rfc_close(tBTA_AG_SCB *p_scb, tBTA_AG_DATA *p_data)
     p_scb->slc_pend_open = FALSE;
     bta_ag_at_reinit(&p_scb->at_cb);
 
-    memset(&(p_scb->peer_hf_indicators), 0, sizeof(p_scb->peer_hf_indicators));
-    memset(&(p_scb->local_hf_indicators), 0, sizeof(p_scb->local_hf_indicators));
-
     /* stop timers */
     alarm_cancel(p_scb->ring_timer);
 #if (BTM_WBS_INCLUDED == TRUE)

diff --git a/bta/ag/bta_ag_cfg.c b/bta/ag/bta_ag_cfg.c
index e5893e1..cfe298a 100644 (file)
--- a/bta/ag/bta_ag_cfg.c
+++ b/bta/ag/bta_ag_cfg.c
@@ -52,24 +52,9 @@
                                                                  BTM_SCO_PKT_TYPES_MASK_NO_3_EV5)
 #endif
 
-#ifndef BTA_AG_BIND_INFO
-#define BTA_AG_BIND_INFO "(1)"
-#endif
-
-const tBTA_AG_HF_IND bta_ag_local_hf_ind_cfg[] =
-{
-    /* The first row contains the number of indicators. Need to be updated accordingly */
-    {BTA_AG_NUM_LOCAL_HF_IND,   0,  0,  0,  0},
-
-    {1,    1,   1,   0,    1},     /* Enhanced Driver Status, supported, enabled, range 0 ~ 1 */
-    {2,    1,   1,   0,    100}    /* Battery Level Status, supported, enabled, range 0 ~ 100 */
-};
-
 const tBTA_AG_CFG bta_ag_cfg =
 {
     BTA_AG_CIND_INFO,
-    BTA_AG_BIND_INFO,
-    BTA_AG_NUM_LOCAL_HF_IND,
     BTA_AG_CONN_TIMEOUT,
     BTA_AG_SCO_PKT_TYPES,
     BTA_AG_CHLD_VAL_ECC,

diff --git a/bta/ag/bta_ag_sdp.c b/bta/ag/bta_ag_sdp.c
index 78fcb4b..1f8ca5c 100644 (file)
--- a/bta/ag/bta_ag_sdp.c
+++ b/bta/ag/bta_ag_sdp.c
@@ -163,7 +163,7 @@ BOOLEAN bta_ag_add_record(UINT16 service_uuid, char *p_service_name, UINT8 scn,
     if (service_uuid == UUID_SERVCLASS_AG_HANDSFREE)
     {
         profile_uuid = UUID_SERVCLASS_HF_HANDSFREE;
-        version = BTA_HFP_VERSION;
+        version = HFP_VERSION_1_6;
     }
     else
     {

diff --git a/bta/hh/bta_hh_le.c b/bta/hh/bta_hh_le.c
index 6441f63..1e9f844 100644 (file)
--- a/bta/hh/bta_hh_le.c
+++ b/bta/hh/bta_hh_le.c
@@ -865,7 +865,7 @@ void bta_hh_le_register_input_notif(tBTA_HH_DEV_CB *p_dev_cb, UINT8 srvc_inst,
 *******************************************************************************/
 void bta_hh_le_deregister_input_notif(tBTA_HH_DEV_CB *p_dev_cb)
 {
-    tBTA_HH_LE_RPT  *p_rpt = &p_dev_cb->hid_srvc.report[0];
+    tBTA_HH_LE_RPT  *p_rpt = &p_dev_cb->hid_srvc[p_dev_cb->cur_srvc_index].report[0];
 
     for (UINT8 i = 0; i < BTA_HH_LE_RPT_MAX; i++, p_rpt++)
     {

diff --git a/btif/src/btif_gatt_qual.c b/btif/src/btif_gatt_qual.c
index bdd9d89..f973d67 100644 (file)
--- a/btif/src/btif_gatt_qual.c
+++ b/btif/src/btif_gatt_qual.c
@@ -74,7 +74,7 @@ void Gatt_StartIf(tGATT_IF gatt_if)
 BOOLEAN Gatt_Connect (tGATT_IF gatt_if, BD_ADDR bd_addr, BOOLEAN is_direct,tBT_TRANSPORT transport)
 {
     BOOLEAN     Ret = 0;
-    Ret = GATT_Connect(gatt_if, bd_addr, is_direct,BT_TRANSPORT_LE);
+    Ret = GATT_Connect(gatt_if, bd_addr, is_direct,BT_TRANSPORT_LE, false);
     printf("%s::Ret=%d,gatt_if=%d, is_direct=%d \n", __FUNCTION__, Ret, gatt_if, is_direct);
     return Ret;
 }

diff --git a/btif/src/btif_media_task.c b/btif/src/btif_media_task.c
index 5ba5ad2..a32d6f2 100644 (file)
--- a/btif/src/btif_media_task.c
+++ b/btif/src/btif_media_task.c
@@ -4260,7 +4260,7 @@ static void btif_media_aa_prep_sbc_2_send(UINT8 nb_frame,
 static void btif_media_aa_prep_2_send(UINT8 nb_frame, uint64_t timestamp_us)
 {
     // Check for TX queue overflow
-
+    BD_ADDR peer_bda;
     if (nb_frame > MAX_OUTPUT_A2DP_FRAME_QUEUE_SZ)
         nb_frame = MAX_OUTPUT_A2DP_FRAME_QUEUE_SZ;
 
@@ -4280,8 +4280,8 @@ static void btif_media_aa_prep_2_send(UINT8 nb_frame, uint64_t timestamp_us)
         }
 
         // Request RSSI for log purposes if we had to flush buffers
-        bt_bdaddr_t peer_bda = btif_av_get_addr();
-        BTM_ReadRSSI(peer_bda.address, btm_read_rssi_cb);
+        btif_av_get_addr(peer_bda);
+        BTM_ReadRSSI(peer_bda, btm_read_rssi_cb);
     }
 
     // Transcode frame

diff --git a/stack/include/sdpdefs.h b/stack/include/sdpdefs.h
index a4d6cc2..44d87e7 100644 (file)
--- a/stack/include/sdpdefs.h
+++ b/stack/include/sdpdefs.h
@@ -281,9 +281,6 @@
 #define UUID_CODEC_MSBC                         0x0002   /* mSBC */
 #endif
 
-#define UUID_HF_IND_ENHANCED_DRIVER_SAFETY      0x0001   /* Assigned number for Enhanced Safety */
-#define UUID_HF_IND_BATTERY_LEVEL_STATUS        0x0002   /* Assigned number for Battery Status */
-
 /* Define all the 'Descriptor Type' values.
 */
 #define  NULL_DESC_TYPE                     0