resolve merge conflicts of 8bbbee1 to nyc-dev-plus-aosp

Change-Id: Iab6c8263aed7379ed81872a9299aff7e3fcaedbd

diff --cc btif/include/btif_av.h
index fcf5d6a,eaf856e..1f2371f
--- 1/btif/include/btif_av.h
--- 2/btif/include/btif_av.h
+++ b/btif/include/btif_av.h
@@@ -194,8 -191,17 +194,21 @@@ void btif_queue_focus_request(void)
  ********************************************************************************/
  void btif_av_clear_remote_suspend_flag(void);
  
+ /*******************************************************************************
+ **
+ ** Function         btif_av_peer_supports_3mbps
+ **
+ ** Description      Check if the connected A2DP device supports
+ **                  3 Mbps EDR. This function will only work while connected.
+ **                  If not connected it will always return false.
+ **
+ ** Returns          TRUE if remote device is EDR and supports 3 Mbps
+ **
+ *******************************************************************************/
+ BOOLEAN btif_av_peer_supports_3mbps(void);
+ 
 +#ifdef __cplusplus
 +}
 +#endif
 +
  #endif /* BTIF_AV_H */

diff --cc btif/src/btif_av.cc
Simple merge

diff --cc btif/src/btif_media_task.cc
index 9a3bafe,7ab2d75..91ac1c1
--- 1/btif/src/btif_media_task.cc
--- 2/btif/src/btif_media_task.c
+++ b/btif/src/btif_media_task.cc
@@@ -445,10 -460,9 +460,10 @@@ static UINT64 time_now_us(
      return ((UINT64)ts_now.tv_sec * USEC_PER_SEC) + ((UINT64)ts_now.tv_nsec / 1000);
  }
  
 -static void log_tstamps_us(char *comment, uint64_t now_us)
 +static void log_tstamps_us(const char *comment, uint64_t timestamp_us)
  {
-     static UINT64 prev_us = 0;
+     static uint64_t prev_us = 0;
 +    const UINT64 now_us = timestamp_us;
      APPL_TRACE_DEBUG("[%s] ts %08llu, diff : %08llu, queue sz %d", comment, now_us, now_us - prev_us,
                  fixed_queue_length(btif_media_cb.TxAaQ));
      prev_us = now_us;