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

Commit 8883275f authored by Michael Sun's avatar Michael Sun Committed by Automerger Merge Worker
Browse files

Merge changes Ide9664f6,I685d9c29,I8aa9a46b,I54e1cd27 am: 0ba81dc6 am: ded6dd9d am: cb14e64d 

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



Change-Id: Ie81f5aea40ed70d2242bf196cf5f6d9514205370
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents dc0b97ba cb14e64d

system/btif/src/btif_av.cc

+64 −38
Original line number Diff line number Diff line
@@ -696,7 +696,9 @@ static void btif_av_handle_event(uint8_t peer_sep, 
                                 tBTA_AV_HNDL bta_handle,

                                 const BtifAvEvent& btif_av_event);

static void btif_report_connection_state(const RawAddress& peer_address,

                                         btav_connection_state_t state);

                                         btav_connection_state_t state,

                                         const bt_status_t status,

                                         uint8_t error_code);

static void btif_report_audio_state(const RawAddress& peer_address,

                                    btav_audio_state_t state);

static void btif_av_report_sink_audio_config_state(
@@ -1558,8 +1560,9 @@ bool BtifAvStateMachine::StateIdle::ProcessEvent(uint32_t event, void* p_data) { 
               (status == BTA_AV_SUCCESS) ? "SUCCESS" : "FAILED",

               p_bta_data->open.edr);



      btif_report_connection_state(peer_.PeerAddress(),

                                   BTAV_CONNECTION_STATE_CONNECTING);

      btif_report_connection_state(

          peer_.PeerAddress(), BTAV_CONNECTION_STATE_CONNECTING,

          bt_status_t::BT_STATUS_SUCCESS, BTA_AV_SUCCESS);



      if (p_bta_data->open.status == BTA_AV_SUCCESS) {

        peer_.SetEdr(p_bta_data->open.edr);
@@ -1581,8 +1584,9 @@ bool BtifAvStateMachine::StateIdle::ProcessEvent(uint32_t event, void* p_data) { 
            sink_disconnect_src(peer_.PeerAddress());

          }



          btif_report_connection_state(peer_.PeerAddress(),

                                       BTAV_CONNECTION_STATE_DISCONNECTED);

          btif_report_connection_state(

              peer_.PeerAddress(), BTAV_CONNECTION_STATE_DISCONNECTED,

              bt_status_t::BT_STATUS_NOMEM, BTA_AV_FAIL_RESOURCES);

          peer_.StateMachine().TransitionTo(BtifAvStateMachine::kStateIdle);

        } else {

          if (peer_.IsSink()) {
@@ -1595,13 +1599,15 @@ bool BtifAvStateMachine::StateIdle::ProcessEvent(uint32_t event, void* p_data) { 
            // Bring up AVRCP connection as well

            BTA_AvOpenRc(peer_.BtaHandle());

          }

          btif_report_connection_state(peer_.PeerAddress(),

                                       BTAV_CONNECTION_STATE_CONNECTED);

          btif_report_connection_state(

              peer_.PeerAddress(), BTAV_CONNECTION_STATE_CONNECTED,

              bt_status_t::BT_STATUS_SUCCESS, BTA_AV_SUCCESS);

          peer_.StateMachine().TransitionTo(BtifAvStateMachine::kStateOpened);

        }

      } else {

        btif_report_connection_state(peer_.PeerAddress(),

                                     BTAV_CONNECTION_STATE_DISCONNECTED);

                                     BTAV_CONNECTION_STATE_DISCONNECTED,

                                     bt_status_t::BT_STATUS_FAIL, status);

        peer_.StateMachine().TransitionTo(BtifAvStateMachine::kStateIdle);

      }

      btif_queue_advance();
@@ -1654,7 +1660,8 @@ void BtifAvStateMachine::StateOpening::OnEnter() { 


  // Inform the application that we are entering connecting state

  btif_report_connection_state(peer_.PeerAddress(),

                               BTAV_CONNECTION_STATE_CONNECTING);

                               BTAV_CONNECTION_STATE_CONNECTING,

                               bt_status_t::BT_STATUS_SUCCESS, BTA_AV_SUCCESS);

}



void BtifAvStateMachine::StateOpening::OnExit() {
@@ -1688,7 +1695,8 @@ bool BtifAvStateMachine::StateOpening::ProcessEvent(uint32_t event, 
                                   A2DP_CONNECTION_ACL_DISCONNECTED,

                               1);

      btif_report_connection_state(peer_.PeerAddress(),

                                   BTAV_CONNECTION_STATE_DISCONNECTED);

                                   BTAV_CONNECTION_STATE_DISCONNECTED,

                                   bt_status_t::BT_STATUS_FAIL, BTA_AV_FAIL);

      peer_.StateMachine().TransitionTo(BtifAvStateMachine::kStateIdle);

      if (peer_.SelfInitiatedConnection()) {

        btif_queue_advance();
@@ -1702,8 +1710,9 @@ bool BtifAvStateMachine::StateOpening::ProcessEvent(uint32_t event, 
      log_counter_metrics_btif(android::bluetooth::CodePathCounterKeyEnum::

                                   A2DP_CONNECTION_REJECT_EVT,

                               1);

      btif_report_connection_state(peer_.PeerAddress(),

                                   BTAV_CONNECTION_STATE_DISCONNECTED);

      btif_report_connection_state(

          peer_.PeerAddress(), BTAV_CONNECTION_STATE_DISCONNECTED,

          bt_status_t::BT_STATUS_AUTH_REJECTED, BTA_AV_FAIL);

      peer_.StateMachine().TransitionTo(BtifAvStateMachine::kStateIdle);

      if (peer_.SelfInitiatedConnection()) {

        btif_queue_advance();
@@ -1727,8 +1736,9 @@ bool BtifAvStateMachine::StateOpening::ProcessEvent(uint32_t event, 
        peer_.SetEdr(p_bta_data->open.edr);

        CHECK(peer_.PeerSep() == p_bta_data->open.sep);

        // Report the connection state to the application

        btif_report_connection_state(peer_.PeerAddress(),

                                     BTAV_CONNECTION_STATE_CONNECTED);

        btif_report_connection_state(

            peer_.PeerAddress(), BTAV_CONNECTION_STATE_CONNECTED,

            bt_status_t::BT_STATUS_SUCCESS, BTA_AV_SUCCESS);

        log_counter_metrics_btif(

            android::bluetooth::CodePathCounterKeyEnum::A2DP_CONNECTION_SUCCESS,

            1);
@@ -1748,7 +1758,8 @@ bool BtifAvStateMachine::StateOpening::ProcessEvent(uint32_t event, 
        av_state = BtifAvStateMachine::kStateIdle;

        // Report the connection state to the application

        btif_report_connection_state(peer_.PeerAddress(),

                                     BTAV_CONNECTION_STATE_DISCONNECTED);

                                     BTAV_CONNECTION_STATE_DISCONNECTED,

                                     bt_status_t::BT_STATUS_FAIL, status);

        log_counter_metrics_btif(

            android::bluetooth::CodePathCounterKeyEnum::A2DP_CONNECTION_FAILURE,

            1);
@@ -1822,7 +1833,8 @@ bool BtifAvStateMachine::StateOpening::ProcessEvent(uint32_t event, 
    case BTA_AV_CLOSE_EVT:

      btif_a2dp_on_stopped(nullptr);

      btif_report_connection_state(peer_.PeerAddress(),

                                   BTAV_CONNECTION_STATE_DISCONNECTED);

                                   BTAV_CONNECTION_STATE_DISCONNECTED,

                                   bt_status_t::BT_STATUS_FAIL, BTA_AV_FAIL);

      peer_.StateMachine().TransitionTo(BtifAvStateMachine::kStateIdle);

      log_counter_metrics_btif(

          android::bluetooth::CodePathCounterKeyEnum::A2DP_CONNECTION_CLOSE, 1);
@@ -1834,7 +1846,8 @@ bool BtifAvStateMachine::StateOpening::ProcessEvent(uint32_t event, 
    case BTIF_AV_DISCONNECT_REQ_EVT:

      BTA_AvClose(peer_.BtaHandle());

      btif_report_connection_state(peer_.PeerAddress(),

                                   BTAV_CONNECTION_STATE_DISCONNECTED);

                                   BTAV_CONNECTION_STATE_DISCONNECTED,

                                   bt_status_t::BT_STATUS_FAIL, BTA_AV_FAIL);

      peer_.StateMachine().TransitionTo(BtifAvStateMachine::kStateIdle);

      log_counter_metrics_btif(android::bluetooth::CodePathCounterKeyEnum::

                                   A2DP_CONNECTION_DISCONNECTED,
@@ -1985,8 +1998,9 @@ bool BtifAvStateMachine::StateOpened::ProcessEvent(uint32_t event, 
      }



      // Inform the application that we are disconnecting

      btif_report_connection_state(peer_.PeerAddress(),

                                   BTAV_CONNECTION_STATE_DISCONNECTING);

      btif_report_connection_state(

          peer_.PeerAddress(), BTAV_CONNECTION_STATE_DISCONNECTING,

          bt_status_t::BT_STATUS_SUCCESS, BTA_AV_SUCCESS);



      // Wait in closing state until fully closed

      peer_.StateMachine().TransitionTo(BtifAvStateMachine::kStateClosing);
@@ -1995,8 +2009,9 @@ bool BtifAvStateMachine::StateOpened::ProcessEvent(uint32_t event, 
    case BTA_AV_CLOSE_EVT:

      // AVDTP link is closed

      // Inform the application that we are disconnecting

      btif_report_connection_state(peer_.PeerAddress(),

                                   BTAV_CONNECTION_STATE_DISCONNECTING);

      btif_report_connection_state(

          peer_.PeerAddress(), BTAV_CONNECTION_STATE_DISCONNECTING,

          bt_status_t::BT_STATUS_SUCCESS, BTA_AV_SUCCESS);

      // Change state to Idle, send acknowledgement if start is pending

      if (peer_.CheckFlags(BtifAvPeer::kFlagPendingStart)) {

        BTIF_TRACE_WARNING("%s: Peer %s : failed pending start request",
@@ -2014,8 +2029,9 @@ bool BtifAvStateMachine::StateOpened::ProcessEvent(uint32_t event, 
      }



      // Inform the application that we are disconnected

      btif_report_connection_state(peer_.PeerAddress(),

                                   BTAV_CONNECTION_STATE_DISCONNECTED);

      btif_report_connection_state(

          peer_.PeerAddress(), BTAV_CONNECTION_STATE_DISCONNECTED,

          bt_status_t::BT_STATUS_SUCCESS, BTA_AV_SUCCESS);

      peer_.StateMachine().TransitionTo(BtifAvStateMachine::kStateIdle);

      break;
@@ -2175,8 +2191,9 @@ bool BtifAvStateMachine::StateStarted::ProcessEvent(uint32_t event, 
      }



      // Inform the application that we are disconnecting

      btif_report_connection_state(peer_.PeerAddress(),

                                   BTAV_CONNECTION_STATE_DISCONNECTING);

      btif_report_connection_state(

          peer_.PeerAddress(), BTAV_CONNECTION_STATE_DISCONNECTING,

          bt_status_t::BT_STATUS_SUCCESS, BTA_AV_SUCCESS);



      // Wait in closing state until fully closed

      peer_.StateMachine().TransitionTo(BtifAvStateMachine::kStateClosing);
@@ -2251,8 +2268,9 @@ bool BtifAvStateMachine::StateStarted::ProcessEvent(uint32_t event, 
               BtifAvEvent::EventName(event).c_str(),

               peer_.FlagsToString().c_str());

      // Inform the application that we are disconnecting

      btif_report_connection_state(peer_.PeerAddress(),

                                   BTAV_CONNECTION_STATE_DISCONNECTING);

      btif_report_connection_state(

          peer_.PeerAddress(), BTAV_CONNECTION_STATE_DISCONNECTING,

          bt_status_t::BT_STATUS_SUCCESS, BTA_AV_SUCCESS);



      peer_.SetFlags(BtifAvPeer::kFlagPendingStop);
@@ -2262,8 +2280,9 @@ bool BtifAvStateMachine::StateStarted::ProcessEvent(uint32_t event, 
      }



      // Inform the application that we are disconnected

      btif_report_connection_state(peer_.PeerAddress(),

                                   BTAV_CONNECTION_STATE_DISCONNECTED);

      btif_report_connection_state(

          peer_.PeerAddress(), BTAV_CONNECTION_STATE_DISCONNECTED,

          bt_status_t::BT_STATUS_SUCCESS, BTA_AV_SUCCESS);



      peer_.StateMachine().TransitionTo(BtifAvStateMachine::kStateIdle);

      break;
@@ -2341,8 +2360,9 @@ bool BtifAvStateMachine::StateClosing::ProcessEvent(uint32_t event, 


    case BTA_AV_CLOSE_EVT:

      // Inform the application that we are disconnecting

      btif_report_connection_state(peer_.PeerAddress(),

                                   BTAV_CONNECTION_STATE_DISCONNECTED);

      btif_report_connection_state(

          peer_.PeerAddress(), BTAV_CONNECTION_STATE_DISCONNECTED,

          bt_status_t::BT_STATUS_SUCCESS, BTA_AV_SUCCESS);



      peer_.StateMachine().TransitionTo(BtifAvStateMachine::kStateIdle);

      break;
@@ -2446,18 +2466,24 @@ static void btif_av_sink_initiate_av_open_timer_timeout(void* data) { 
 * @param state the connection state

 */

static void btif_report_connection_state(const RawAddress& peer_address,

                                         btav_connection_state_t state) {

                                         btav_connection_state_t state,

                                         bt_status_t status,

                                         uint8_t error_code) {

  LOG_INFO("%s: peer_address=%s state=%d", __func__,

           peer_address.ToString().c_str(), state);



  if (btif_av_source.Enabled()) {

    do_in_jni_thread(FROM_HERE,

    do_in_jni_thread(

        FROM_HERE,

        base::Bind(btif_av_source.Callbacks()->connection_state_cb,

                                peer_address, state, btav_error_t{}));

                   peer_address, state,

                   btav_error_t{.status = status, .error_code = error_code}));

  } else if (btif_av_sink.Enabled()) {

    do_in_jni_thread(FROM_HERE,

                     base::Bind(btif_av_sink.Callbacks()->connection_state_cb,

                                peer_address, state, btav_error_t{}));

    do_in_jni_thread(

        FROM_HERE,

        base::Bind(btif_av_sink.Callbacks()->connection_state_cb, peer_address,

                   state,

                   btav_error_t{.status = status, .error_code = error_code}));

  }

}

system/gd/metrics/chromeos/metrics_event.cc

+24 −2
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 


#include "hci/hci_packets.h"

#include "include/hardware/bluetooth.h"

#include "include/hardware/bt_av.h"

#include "include/hardware/bt_hh.h"



namespace bluetooth {
@@ -29,7 +30,9 @@ namespace metrics { 
typedef bt_bond_state_t BtBondState;

// topshim::btif::BtStatus is a copy of hardware/bluetooth.h:bt_status_t

typedef bt_status_t BtStatus;

// topshim::profile::hid_host::BthhConnectionState is a copy of hardware/bluetooth.h:bthh_connection_state_t

// topshim::profile::a2dp::BtavConnectionState is a copy of hardware/bt_av.h:btav_connection_state_t

typedef btav_connection_state_t BtavConnectionState;

// topshim::profile::hid_host::BthhConnectionState is a copy of hardware/bt_hh.h:bthh_connection_state_t

typedef bthh_connection_state_t BthhConnectionState;



// A normalized connection state ENUM definition all profiles
@@ -298,7 +301,26 @@ static std::pair<uint32_t, uint32_t> ToProfileConnectionState(uint32_t profile, 
  std::pair<uint32_t, uint32_t> output;



  switch ((ProfilesFloss)profile) {

    // case ProfilesFloss::A2dpSink:

    case ProfilesFloss::A2dpSink:

      output.first = (uint32_t)Profile::A2DP;

      switch ((BtavConnectionState)state) {

        case BtavConnectionState::BTAV_CONNECTION_STATE_CONNECTED:

          output.second = (uint32_t)ProfilesConnectionState::CONNECTED;

          break;

        case BtavConnectionState::BTAV_CONNECTION_STATE_CONNECTING:

          output.second = (uint32_t)ProfilesConnectionState::CONNECTING;

          break;

        case BtavConnectionState::BTAV_CONNECTION_STATE_DISCONNECTED:

          output.second = (uint32_t)ProfilesConnectionState::DISCONNECTED;

          break;

        case BtavConnectionState::BTAV_CONNECTION_STATE_DISCONNECTING:

          output.second = (uint32_t)ProfilesConnectionState::DISCONNECTING;

          break;

        default:

          output.second = (uint32_t)ProfilesConnectionState::UNKNOWN;

          break;

      }

      break;

    // case ProfilesFloss::A2dpSource:

    // case ProfilesFloss::AdvAudioDist:

    // case ProfilesFloss::Hsp:

system/gd/rust/linux/stack/src/bluetooth_media.rs

+190 −17

File changed.

Preview size limit exceeded, changes collapsed.

system/gd/rust/topshim/btav/btav_shim.cc

+16 −7
Original line number Diff line number Diff line
@@ -152,10 +152,19 @@ static ::rust::Vec<A2dpCodecConfig> to_rust_codec_config_vec(const std::vector<b 
  return rconfigs;

}



static void connection_state_cb(

    const RawAddress& bd_addr, btav_connection_state_t state, [[maybe_unused]] const btav_error_t& error) {

static A2dpError to_rust_error(const btav_error_t& error) {

  A2dpError a2dp_error = {

      .status = error.status,

      .error_code = error.error_code,

      .error_msg = error.error_msg.value_or(""),

  };

  return a2dp_error;

}



static void connection_state_cb(const RawAddress& bd_addr, btav_connection_state_t state, const btav_error_t& error) {

  RustRawAddress addr = rusty::CopyToRustAddress(bd_addr);

  rusty::connection_state_callback(addr, state);

  A2dpError a2dp_error = to_rust_error(error);

  rusty::connection_state_callback(addr, state, a2dp_error);

}

static void audio_state_cb(const RawAddress& bd_addr, btav_audio_state_t state) {

  RustRawAddress addr = rusty::CopyToRustAddress(bd_addr);
@@ -208,11 +217,11 @@ int A2dpIntf::init() const { 
  return intf_->init(&internal::g_callbacks, 1, a, b);

}



int A2dpIntf::connect(RustRawAddress bt_addr) const {

uint32_t A2dpIntf::connect(RustRawAddress bt_addr) const {

  RawAddress addr = rusty::CopyFromRustAddress(bt_addr);

  return intf_->connect(addr);

}

int A2dpIntf::disconnect(RustRawAddress bt_addr) const {

uint32_t A2dpIntf::disconnect(RustRawAddress bt_addr) const {

  RawAddress addr = rusty::CopyFromRustAddress(bt_addr);

  return intf_->disconnect(addr);

}
@@ -286,11 +295,11 @@ void AvrcpIntf::cleanup() { 
  intf_->Cleanup();

}



int AvrcpIntf::connect(RustRawAddress bt_addr) {

uint32_t AvrcpIntf::connect(RustRawAddress bt_addr) {

  RawAddress addr = rusty::CopyFromRustAddress(bt_addr);

  return intf_->ConnectDevice(addr);

}

int AvrcpIntf::disconnect(RustRawAddress bt_addr) {

uint32_t AvrcpIntf::disconnect(RustRawAddress bt_addr) {

  RawAddress addr = rusty::CopyFromRustAddress(bt_addr);

  return intf_->DisconnectDevice(addr);

}

system/gd/rust/topshim/btav/btav_shim.h

+4 −4
Original line number Diff line number Diff line
@@ -39,8 +39,8 @@ class A2dpIntf { 


  // interface for Settings

  int init() const;

  int connect(RustRawAddress bt_addr) const;

  int disconnect(RustRawAddress bt_addr) const;

  uint32_t connect(RustRawAddress bt_addr) const;

  uint32_t disconnect(RustRawAddress bt_addr) const;

  int set_silence_device(RustRawAddress bt_addr, bool silent) const;

  int set_active_device(RustRawAddress bt_addr) const;

  int config_codec(RustRawAddress bt_addr, ::rust::Vec<A2dpCodecConfig> codec_preferences) const;
@@ -65,8 +65,8 @@ class AvrcpIntf { 


  void init();

  void cleanup();

  int connect(RustRawAddress bt_addr);

  int disconnect(RustRawAddress bt_addr);

  uint32_t connect(RustRawAddress bt_addr);

  uint32_t disconnect(RustRawAddress bt_addr);



  // interface for Audio server

  void set_volume(int8_t volume);