Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4fa3df5a authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Replace OS_ANDROID by __ANDROID__" into main

parents da3e225a fdf3f517

system/btif/src/btif_av.cc

+2 −2
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ 
#include "types/bluetooth/uuid.h"

#include "types/raw_address.h"



#ifdef OS_ANDROID

#ifdef __ANDROID__

#include <a2dp.sysprop.h>

#endif
@@ -3400,7 +3400,7 @@ bool btif_av_both_enable(void) { 
}



bool btif_av_src_sink_coexist_enabled(void) {

#ifdef OS_ANDROID

#ifdef __ANDROID__

  return android::sysprop::bluetooth::A2dp::src_sink_coexist().value_or(false);

#else

  return false;

system/btif/src/btif_dm.cc

+2 −2
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ 
#include "stack_config.h"

#include "types/raw_address.h"



#ifdef OS_ANDROID

#ifdef __ANDROID__

#include <android/sysprop/BluetoothProperties.sysprop.h>

#endif
@@ -2941,7 +2941,7 @@ void btif_dm_get_local_class_of_device(DEV_CLASS device_class) { 
  LOG_DEBUG("Using class of device '0x%x, 0x%x, 0x%x' from CoD system property",

            device_class[0], device_class[1], device_class[2]);



#ifdef OS_ANDROID

#ifdef __ANDROID__

  // Per BAP 1.0.1, 8.2.3. Device discovery, the stack needs to set Class of

  // Device (CoD) field Major Service Class bit 14 to 0b1 when Unicast Server,

  // Unicast Client, Broadcast Source, Broadcast Sink, Scan Delegator, or

system/stack/avct/avct_bcb_act.cc

+1 −1
Original line number Diff line number Diff line
@@ -547,7 +547,7 @@ void avct_bcb_msg_ind(tAVCT_BCB* p_bcb, tAVCT_LCB_EVT* p_data) { 
    return;

  }



#ifdef OS_ANDROID

#ifdef __ANDROID__

  bool bind = false;

  if (android::sysprop::bluetooth::A2dp::src_sink_coexist().value_or(false)) {

    bind = avct_msg_ind_for_src_sink_coexist(p_lcb, p_data, label, cr_ipid);

system/stack/avct/avct_l2c.cc

+1 −1
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ void avct_l2c_connect_ind_cback(const RawAddress& bd_addr, uint16_t lcid, 


  /* if result ok, proceed with connection */

  if (result == L2CAP_CONN_OK) {

#ifdef OS_ANDROID

#ifdef __ANDROID__

    if (android::sysprop::bluetooth::A2dp::src_sink_coexist().value_or(false)) {

      tAVCT_CCB* p_ccb = &avct_cb.ccb[0];

      for (int i = 0; i < AVCT_NUM_CONN; i++, p_ccb++) {

system/stack/avct/avct_lcb_act.cc

+2 −2
Original line number Diff line number Diff line
@@ -228,7 +228,7 @@ void avct_lcb_open_ind(tAVCT_LCB* p_lcb, tAVCT_LCB_EVT* p_data) { 
  int i;

  bool bind = false;



#ifdef OS_ANDROID

#ifdef __ANDROID__

  if (android::sysprop::bluetooth::A2dp::src_sink_coexist().value_or(false)) {

    bool is_originater = false;
@@ -683,7 +683,7 @@ void avct_lcb_msg_ind(tAVCT_LCB* p_lcb, tAVCT_LCB_EVT* p_data) { 
    return;

  }



#ifdef OS_ANDROID

#ifdef __ANDROID__

  bool bind = false;

  if (android::sysprop::bluetooth::A2dp::src_sink_coexist().value_or(false)) {

    bind = avct_msg_ind_for_src_sink_coexist(p_lcb, p_data, label, cr_ipid);