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

Commit e586fe14 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "cherrypicker-L52200000960664466:N84600001369065936" into udc-qpr-dev 

* changes:
  Improve AudioProvider logging
  Fix deathRecipient of BluetoothAudioProvider
parents a2cb4b86 d1de935e

bluetooth/audio/aidl/default/BluetoothAudioProvider.cpp

+34 −24
Original line number Diff line number Diff line
@@ -27,9 +27,31 @@ namespace hardware { 
namespace bluetooth {

namespace audio {



struct BluetoothAudioProviderContext {

  SessionType session_type;

};



static void binderUnlinkedCallbackAidl(void* cookie) {

  LOG(INFO) << __func__;

  BluetoothAudioProviderContext* ctx =

      static_cast<BluetoothAudioProviderContext*>(cookie);

  delete ctx;

}



static void binderDiedCallbackAidl(void* cookie) {

  LOG(INFO) << __func__;

  BluetoothAudioProviderContext* ctx =

      static_cast<BluetoothAudioProviderContext*>(cookie);

  CHECK_NE(ctx, nullptr);



  BluetoothAudioSessionReport::OnSessionEnded(ctx->session_type);

}



BluetoothAudioProvider::BluetoothAudioProvider() {

  death_recipient_ = ::ndk::ScopedAIBinder_DeathRecipient(

      AIBinder_DeathRecipient_new(binderDiedCallbackAidl));

  AIBinder_DeathRecipient_setOnUnlinked(death_recipient_.get(),

                                        binderUnlinkedCallbackAidl);

}



ndk::ScopedAStatus BluetoothAudioProvider::startSession(
@@ -39,17 +61,21 @@ ndk::ScopedAStatus BluetoothAudioProvider::startSession( 
    DataMQDesc* _aidl_return) {

  if (host_if == nullptr) {

    *_aidl_return = DataMQDesc();

    LOG(ERROR) << __func__ << " - SessionType=" << toString(session_type_)

               << " Illegal argument";

    return ndk::ScopedAStatus::fromExceptionCode(EX_ILLEGAL_ARGUMENT);

  }



  latency_modes_ = latencyModes;

  audio_config_ = std::make_unique<AudioConfiguration>(audio_config);

  stack_iface_ = host_if;

  is_binder_died = false;

  BluetoothAudioProviderContext* cookie =

      new BluetoothAudioProviderContext{session_type_};



  AIBinder_linkToDeath(stack_iface_->asBinder().get(), death_recipient_.get(),

                       this);

                       cookie);



  LOG(INFO) << __func__ << " - SessionType=" << toString(session_type_);

  onSessionReady(_aidl_return);

  return ndk::ScopedAStatus::ok();

}
@@ -60,10 +86,8 @@ ndk::ScopedAStatus BluetoothAudioProvider::endSession() { 
  if (stack_iface_ != nullptr) {

    BluetoothAudioSessionReport::OnSessionEnded(session_type_);



    if (!is_binder_died) {

    AIBinder_unlinkToDeath(stack_iface_->asBinder().get(),

                           death_recipient_.get(), this);

    }

  } else {

    LOG(INFO) << __func__ << " - SessionType=" << toString(session_type_)

              << " has NO session";
@@ -77,10 +101,9 @@ ndk::ScopedAStatus BluetoothAudioProvider::endSession() { 


ndk::ScopedAStatus BluetoothAudioProvider::streamStarted(

    BluetoothAudioStatus status) {

  if (stack_iface_ != nullptr) {

    LOG(INFO) << __func__ << " - SessionType=" << toString(session_type_)

              << ", status=" << toString(status);



  if (stack_iface_ != nullptr) {

    BluetoothAudioSessionReport::ReportControlStatus(session_type_, true,

                                                     status);

  } else {
@@ -108,8 +131,6 @@ ndk::ScopedAStatus BluetoothAudioProvider::streamSuspended( 


ndk::ScopedAStatus BluetoothAudioProvider::updateAudioConfiguration(

    const AudioConfiguration& audio_config) {

  LOG(INFO) << __func__ << " - SessionType=" << toString(session_type_);



  if (stack_iface_ == nullptr || audio_config_ == nullptr) {

    LOG(INFO) << __func__ << " - SessionType=" << toString(session_type_)

              << " has NO session";
@@ -125,13 +146,13 @@ ndk::ScopedAStatus BluetoothAudioProvider::updateAudioConfiguration( 
  audio_config_ = std::make_unique<AudioConfiguration>(audio_config);

  BluetoothAudioSessionReport::ReportAudioConfigChanged(session_type_,

                                                        *audio_config_);

  LOG(INFO) << __func__ << " - SessionType=" << toString(session_type_)

            << " | audio_config=" << audio_config.toString();

  return ndk::ScopedAStatus::ok();

}



ndk::ScopedAStatus BluetoothAudioProvider::setLowLatencyModeAllowed(

    bool allowed) {

  LOG(INFO) << __func__ << " - SessionType=" << toString(session_type_);



  if (stack_iface_ == nullptr) {

    LOG(INFO) << __func__ << " - SessionType=" << toString(session_type_)

              << " has NO session";
@@ -143,17 +164,6 @@ ndk::ScopedAStatus BluetoothAudioProvider::setLowLatencyModeAllowed( 
  return ndk::ScopedAStatus::ok();

}



void BluetoothAudioProvider::binderDiedCallbackAidl(void* ptr) {

  LOG(ERROR) << __func__ << " - BluetoothAudio Service died";

  auto provider = static_cast<BluetoothAudioProvider*>(ptr);

  if (provider == nullptr) {

    LOG(ERROR) << __func__ << ": Null AudioProvider HAL died";

    return;

  }

  provider->is_binder_died = true;

  provider->endSession();

}



}  // namespace audio

}  // namespace bluetooth

}  // namespace hardware

bluetooth/audio/aidl/default/BluetoothAudioProvider.h

+0 −3
Original line number Diff line number Diff line
@@ -54,7 +54,6 @@ class BluetoothAudioProvider : public BnBluetoothAudioProvider { 


 protected:

  virtual ndk::ScopedAStatus onSessionReady(DataMQDesc* _aidl_return) = 0;

  static void binderDiedCallbackAidl(void* cookie_ptr);



  ::ndk::ScopedAIBinder_DeathRecipient death_recipient_;
@@ -62,9 +61,7 @@ class BluetoothAudioProvider : public BnBluetoothAudioProvider { 
  std::unique_ptr<AudioConfiguration> audio_config_ = nullptr;

  SessionType session_type_;

  std::vector<LatencyMode> latency_modes_;

  bool is_binder_died = false;

};



}  // namespace audio

}  // namespace bluetooth

}  // namespace hardware