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

Commit a45f6e30 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "BtAudio: Fix default implementation typos" am: d6304f24 

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1955930

Change-Id: Iab0a56d16a1f2845948c70ab7b9ad54390c08b56
parents 28e51040 d6304f24

bluetooth/audio/aidl/default/A2dpSoftwareAudioProvider.cpp

+2 −1
Original line number Diff line number Diff line
@@ -88,8 +88,9 @@ ndk::ScopedAStatus A2dpSoftwareAudioProvider::onSessionReady( 
    return ndk::ScopedAStatus::fromExceptionCode(EX_ILLEGAL_ARGUMENT);

  }

  *_aidl_return = data_mq_->dupeDesc();

  auto desc = data_mq_->dupeDesc();

  BluetoothAudioSessionReport::OnSessionStarted(session_type_, stack_iface_,

                                                _aidl_return, *audio_config_);

                                                &desc, *audio_config_);

  return ndk::ScopedAStatus::ok();

}

bluetooth/audio/aidl/default/BluetoothAudioProviderFactory.cpp

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



#define LOG_TAG "BTAudioProvidersFactory"

#define LOG_TAG "BTAudioProviderFactoryAIDL"



#include "BluetoothAudioProviderFactory.h"

bluetooth/audio/aidl/default/BluetoothAudioProviderFactory.h

+0 −7
Original line number Diff line number Diff line
@@ -18,13 +18,6 @@ 


#include <aidl/android/hardware/bluetooth/audio/BnBluetoothAudioProviderFactory.h>



#include "A2dpOffloadAudioProvider.h"

#include "A2dpSoftwareAudioProvider.h"

#include "BluetoothAudioProvider.h"

#include "HearingAidAudioProvider.h"

#include "LeAudioOffloadAudioProvider.h"

#include "LeAudioSoftwareAudioProvider.h"



namespace aidl {

namespace android {

namespace hardware {

bluetooth/audio/aidl/default/HearingAidAudioProvider.cpp

+1 −1
Original line number Diff line number Diff line
@@ -81,10 +81,10 @@ ndk::ScopedAStatus HearingAidAudioProvider::onSessionReady( 
    *_aidl_return = DataMQDesc();

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

  }

  *_aidl_return = data_mq_->dupeDesc();

  auto desc = data_mq_->dupeDesc();

  BluetoothAudioSessionReport::OnSessionStarted(session_type_, stack_iface_,

                                                &desc, *audio_config_);

  *_aidl_return = data_mq_->dupeDesc();

  return ndk::ScopedAStatus::ok();

}

bluetooth/audio/aidl/default/LeAudioOffloadAudioProvider.cpp

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



#define LOG_TAG "BTAudioProviderLeAudioSW"

#define LOG_TAG "BTAudioProviderLeAudioHW"



#include "LeAudioOffloadAudioProvider.h"