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

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

Merge "Add support LE audio offload for HIDL 2.2" am: d2645ae7 am: 5513c435 am: e22eea81 

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

Change-Id: I682e3d05bf5fa8638a20d3c5bd242477df75e03c
parents 20d510ef e22eea81

bluetooth/audio/2.1/default/BluetoothAudioProvidersFactory.cpp

+5 −1
Original line number Original line Diff line number Diff line
@@ -157,7 +157,11 @@ Return<void> BluetoothAudioProvidersFactory::getProviderCapabilities_2_1( 
        audio_capabilities[i].codecCapabilities(db_codec_capabilities[i]);

        audio_capabilities[i].codecCapabilities(db_codec_capabilities[i]);

      }

      }

    }

    }

  } else if (sessionType != SessionType::UNKNOWN) {

  } else if (sessionType !=

                 SessionType::LE_AUDIO_HARDWARE_OFFLOAD_ENCODING_DATAPATH &&

             sessionType !=

                 SessionType::LE_AUDIO_HARDWARE_OFFLOAD_DECODING_DATAPATH &&

             sessionType != SessionType::UNKNOWN) {

    std::vector<PcmParameters> db_pcm_capabilities =

    std::vector<PcmParameters> db_pcm_capabilities =

        android::bluetooth::audio::GetSoftwarePcmCapabilities_2_1();

        android::bluetooth::audio::GetSoftwarePcmCapabilities_2_1();

    if (db_pcm_capabilities.size() == 1) {

    if (db_pcm_capabilities.size() == 1) {

bluetooth/audio/2.2/default/A2dpSoftwareAudioProvider.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -21,7 +21,7 @@ 
#include <android-base/logging.h>

#include <android-base/logging.h>





#include "BluetoothAudioSessionReport_2_2.h"

#include "BluetoothAudioSessionReport_2_2.h"

#include "BluetoothAudioSupportedCodecsDB_2_1.h"

#include "BluetoothAudioSupportedCodecsDB_2_2.h"





namespace android {

namespace android {

namespace hardware {

namespace hardware {

bluetooth/audio/2.2/default/BluetoothAudioProvider.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -22,7 +22,7 @@ 




#include "AudioPort_2_0_to_2_2_Wrapper.h"

#include "AudioPort_2_0_to_2_2_Wrapper.h"

#include "BluetoothAudioSessionReport_2_2.h"

#include "BluetoothAudioSessionReport_2_2.h"

#include "BluetoothAudioSupportedCodecsDB_2_1.h"

#include "BluetoothAudioSupportedCodecsDB_2_2.h"





namespace android {

namespace android {

namespace hardware {

namespace hardware {

bluetooth/audio/2.2/default/BluetoothAudioProvidersFactory.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -20,7 +20,7 @@ 




#include <android-base/logging.h>

#include <android-base/logging.h>





#include "BluetoothAudioSupportedCodecsDB_2_1.h"

#include "BluetoothAudioSupportedCodecsDB_2_2.h"





namespace android {

namespace android {

namespace hardware {

namespace hardware {

bluetooth/audio/2.2/default/HearingAidAudioProvider.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -21,7 +21,7 @@ 
#include <android-base/logging.h>

#include <android-base/logging.h>





#include "BluetoothAudioSessionReport_2_2.h"

#include "BluetoothAudioSessionReport_2_2.h"

#include "BluetoothAudioSupportedCodecsDB_2_1.h"

#include "BluetoothAudioSupportedCodecsDB_2_2.h"





namespace android {

namespace android {

namespace hardware {

namespace hardware {