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

Commit 4a22f865 authored by Henri Chataing's avatar Henri Chataing Committed by Automerger Merge Worker
Browse files

Merge "system: Remove logbool()" into main am: c7e227e8 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3032088



Change-Id: I2434fd8ee14c6def6bfe5829126b94e4270aa58e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 06d6bcf3 c7e227e8

android/app/jni/com_android_bluetooth_le_audio.cpp

+2 −1
Original line number Diff line number Diff line
@@ -1079,7 +1079,8 @@ jobject prepareBluetoothLeBroadcastMetadataObject( 
    env->SetByteArrayRegion(

        code.get(), 0, nativeCodeSize,

        (const jbyte*)broadcast_metadata.broadcast_code->data());

    log::assert_that(!env->ExceptionCheck(), "assert failed: !env->ExceptionCheck()");

    log::assert_that(!env->ExceptionCheck(),

                     "assert failed: !env->ExceptionCheck()");

  }



  ScopedLocalRef<jstring> broadcast_name(

android/app/jni/com_android_bluetooth_vc.cpp

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#define LOG_TAG "BluetoothVolumeControlServiceJni"



#include <string.h>



#include <shared_mutex>



#include "com_android_bluetooth.h"

system/bta/ag/bta_ag_act.cc

+1 −2
Original line number Diff line number Diff line
@@ -862,8 +862,7 @@ void bta_ag_setcodec(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data) { 
  tBTA_AG_VAL val = {};

  const bool aptx_voice = is_hfp_aptx_voice_enabled() &&

                          (codec_type == BTA_AG_SCO_APTX_SWB_SETTINGS_Q0);

  log::verbose("aptx_voice={}, codec_type={:#x}", logbool(aptx_voice),

               codec_type);

  log::verbose("aptx_voice={}, codec_type={:#x}", aptx_voice, codec_type);



  val.hdr.handle = bta_ag_scb_to_idx(p_scb);

system/bta/ag/bta_ag_cmd.cc

+1 −1
Original line number Diff line number Diff line
@@ -1249,7 +1249,7 @@ void bta_ag_at_hfp_cback(tBTA_AG_SCB* p_scb, uint16_t cmd, uint8_t arg_type, 
        bool swb_supported = hfp_hal_interface::get_swb_supported();

        const bool aptx_voice =

            is_hfp_aptx_voice_enabled() && p_scb->is_aptx_swb_codec;

        log::verbose("BTA_AG_AT_BAC_EVT aptx_voice={}", logbool(aptx_voice));

        log::verbose("BTA_AG_AT_BAC_EVT aptx_voice={}", aptx_voice);



        if (swb_supported && (p_scb->peer_codecs & BTM_SCO_CODEC_LC3) &&

            !(p_scb->disabled_codecs & BTM_SCO_CODEC_LC3)) {

system/bta/ag/bta_ag_sco.cc

+9 −9
Original line number Diff line number Diff line
@@ -194,10 +194,10 @@ static void bta_ag_sco_disc_cback(uint16_t sco_idx) { 
  log::debug("sco_idx: 0x{:x} sco.state:{}", sco_idx,

             sco_state_text(static_cast<tSCO_STATE>(bta_ag_cb.sco.state)));

  log::debug("scb[0] in_use:{} sco_idx: 0x{:x} sco state:{}",

             logbool(bta_ag_cb.scb[0].in_use), bta_ag_cb.scb[0].sco_idx,

             bta_ag_cb.scb[0].in_use, bta_ag_cb.scb[0].sco_idx,

             sco_state_text(static_cast<tSCO_STATE>(bta_ag_cb.scb[0].state)));

  log::debug("scb[1] in_use:{} sco_idx:0x{:x} sco state:{}",

             logbool(bta_ag_cb.scb[1].in_use), bta_ag_cb.scb[1].sco_idx,

             bta_ag_cb.scb[1].in_use, bta_ag_cb.scb[1].sco_idx,

             sco_state_text(static_cast<tSCO_STATE>(bta_ag_cb.scb[1].state)));



  /* match callback to scb */
@@ -215,7 +215,7 @@ static void bta_ag_sco_disc_cback(uint16_t sco_idx) { 
        (bta_ag_cb.sco.p_curr_scb->is_aptx_swb_codec == true) &&

        (bta_ag_cb.sco.p_curr_scb->inuse_codec ==

         BTA_AG_SCO_APTX_SWB_SETTINGS_Q0);

    log::verbose("aptx_voice={}, inuse_codec={:#x}", logbool(aptx_voice),

    log::verbose("aptx_voice={}, inuse_codec={:#x}", aptx_voice,

                 bta_ag_cb.sco.p_curr_scb->inuse_codec);



    /* Restore settings */
@@ -740,9 +740,9 @@ void bta_ag_codec_negotiate(tBTA_AG_SCB* p_scb) { 
                            &p_scb->peer_addr) ||

       p_scb->is_aptx_swb_codec);

  log::verbose(

      "aptx_voice={}, is_aptx_swb_codec={}, Q0 codec supported={}",

      logbool(aptx_voice), logbool(p_scb->is_aptx_swb_codec),

      logbool(p_scb->peer_codecs & BTA_AG_SCO_APTX_SWB_SETTINGS_Q0_MASK));

      "aptx_voice={}, is_aptx_swb_codec={}, Q0 codec supported={}", aptx_voice,

      p_scb->is_aptx_swb_codec,

      (p_scb->peer_codecs & BTA_AG_SCO_APTX_SWB_SETTINGS_Q0_MASK) != 0);



  if (((p_scb->codec_updated || p_scb->codec_fallback) &&

       (p_scb->features & BTA_AG_FEAT_CODEC) &&
@@ -760,7 +760,7 @@ void bta_ag_codec_negotiate(tBTA_AG_SCB* p_scb) { 
        p_scb->is_aptx_swb_codec = true;

      }

      log::verbose("Sending +QCS, sco_codec={}, is_aptx_swb_codec={}",

                   p_scb->sco_codec, logbool(p_scb->is_aptx_swb_codec));

                   p_scb->sco_codec, p_scb->is_aptx_swb_codec);

      /* Send +QCS to the peer */

      bta_ag_send_qcs(p_scb, NULL);

    } else {
@@ -769,7 +769,7 @@ void bta_ag_codec_negotiate(tBTA_AG_SCB* p_scb) { 
        p_scb->is_aptx_swb_codec = false;

      }

      log::verbose("Sending +BCS, sco_codec={}, is_aptx_swb_codec={}",

                   p_scb->sco_codec, logbool(p_scb->is_aptx_swb_codec));

                   p_scb->sco_codec, p_scb->is_aptx_swb_codec);

      /* Send +BCS to the peer */

      bta_ag_send_bcs(p_scb);

    }
@@ -1511,7 +1511,7 @@ void bta_ag_sco_conn_close(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& /* data */) { 
                          p_scb->codec_fallback &&

                          (p_scb->sco_codec == BTA_AG_SCO_APTX_SWB_SETTINGS_Q0);

  log::verbose("aptx_voice={}, codec_fallback={:#x}, sco_codec={:#x}",

               logbool(aptx_voice), p_scb->codec_fallback, p_scb->sco_codec);

               aptx_voice, p_scb->codec_fallback, p_scb->sco_codec);



  /* codec_fallback is set when AG is initiator and connection failed for mSBC.

   * OR if codec is msbc and T2 settings failed, then retry Safe T1 settings