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

Commit d4673317 authored by Hui Peng's avatar Hui Peng Committed by Automerger Merge Worker
Browse files

Merge "Replace Log Statements in system/bta" am: bf83b3b8 

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



Change-Id: I408d9b0009431787e56e8e560cd99ec17b86c88d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7fa57d41 bf83b3b8

system/bta/ag/bta_ag_act.cc

+2 −2
Original line number Diff line number Diff line
@@ -461,7 +461,7 @@ void bta_ag_rfc_open(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data) { 
            p_scb->peer_addr.ToString(), HFP_VERSION_CONFIG_KEY,

            (uint8_t*)&p_scb->peer_version, &version_value_size)) {

      APPL_TRACE_WARNING("%s: Failed read cached peer HFP version for %s",

                         __func__, p_scb->peer_addr.ToString().c_str());

                         __func__, ADDRESS_TO_LOGGABLE_CSTR(p_scb->peer_addr));

      p_scb->peer_version = HFP_HSP_VERSION_UNKNOWN;

    }

    size_t sdp_features_size = sizeof(p_scb->peer_sdp_features);
@@ -476,7 +476,7 @@ void bta_ag_rfc_open(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data) { 
      }

    } else {

      APPL_TRACE_WARNING("%s: Failed read cached peer HFP SDP features for %s",

                         __func__, p_scb->peer_addr.ToString().c_str());

                         __func__, ADDRESS_TO_LOGGABLE_CSTR(p_scb->peer_addr));

    }

  }

system/bta/ag/bta_ag_int.h

+1 −1
Original line number Diff line number Diff line
@@ -268,7 +268,7 @@ struct tBTA_AG_SCB { 
        "codec_updated=%d, codec_fallback=%d, "

        "sco_codec=%d, peer_codec=%d, msbc_settings=%d, device=%s",

        codec_updated, codec_fallback, sco_codec, peer_codecs,

        codec_msbc_settings, peer_addr.ToString().c_str());

        codec_msbc_settings, ADDRESS_TO_LOGGABLE_CSTR(peer_addr));

  }

};

system/bta/ag/bta_ag_sco.cc

+4 −3
Original line number Diff line number Diff line
@@ -373,7 +373,8 @@ static void bta_ag_create_sco(tBTA_AG_SCB* p_scb, bool is_orig) { 
  /* Make sure this SCO handle is not already in use */

  if (p_scb->sco_idx != BTM_INVALID_SCO_INDEX) {

    APPL_TRACE_ERROR("%s: device %s, index 0x%04x already in use!", __func__,

                     p_scb->peer_addr.ToString().c_str(), p_scb->sco_idx);

                     ADDRESS_TO_LOGGABLE_CSTR(p_scb->peer_addr),

                     p_scb->sco_idx);

    return;

  }
@@ -1233,13 +1234,13 @@ void bta_ag_sco_codec_nego(tBTA_AG_SCB* p_scb, bool result) { 
  if (result) {

    /* Subsequent SCO connection will skip codec negotiation */

    LOG_INFO("Succeeded for index 0x%04x, device %s", p_scb->sco_idx,

             p_scb->peer_addr.ToString().c_str());

             ADDRESS_TO_LOGGABLE_CSTR(p_scb->peer_addr));

    p_scb->codec_updated = false;

    bta_ag_sco_event(p_scb, BTA_AG_SCO_CN_DONE_E);

  } else {

    /* codec negotiation failed */

    LOG_INFO("Failed for index 0x%04x, device %s", p_scb->sco_idx,

             p_scb->peer_addr.ToString().c_str());

             ADDRESS_TO_LOGGABLE_CSTR(p_scb->peer_addr));

    bta_ag_sco_event(p_scb, BTA_AG_SCO_CLOSE_E);

  }

}

system/bta/ag/bta_ag_sdp.cc

+3 −2
Original line number Diff line number Diff line
@@ -352,7 +352,8 @@ bool bta_ag_sdp_find_attr(tBTA_AG_SCB* p_scb, tBTA_SERVICE_MASK service) { 
          btif_config_save();

        } else {

          APPL_TRACE_WARNING("%s: Failed to store peer HFP version for %s",

                             __func__, p_scb->peer_addr.ToString().c_str());

                             __func__,

                             ADDRESS_TO_LOGGABLE_CSTR(p_scb->peer_addr));

        }

      }

      /* get features if HFP */
@@ -381,7 +382,7 @@ bool bta_ag_sdp_find_attr(tBTA_AG_SCB* p_scb, tBTA_SERVICE_MASK service) { 
          } else {

            APPL_TRACE_WARNING(

                "%s: Failed to store peer HFP SDP Features for %s", __func__,

                p_scb->peer_addr.ToString().c_str());

                ADDRESS_TO_LOGGABLE_CSTR(p_scb->peer_addr));

          }

        }

        if (p_scb->peer_features == 0) {

system/bta/av/bta_av_aact.cc

+82 −70

File changed.

Preview size limit exceeded, changes collapsed.