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

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

Merge "le_broadcast: Use HAL verifier" am: 62582e25 am: 3090dc9c am: e7e7bf10 am: 6a1f811d 

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

Change-Id: I57a47183d3370d3bf37124e37235f84e733ac768
parents 8d70b231 6a1f811d

system/bta/include/bta_le_audio_api.h

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ class LeAudioHalVerifier { 
 public:

  static bool SupportsLeAudio();

  static bool SupportsLeAudioHardwareOffload();

  static bool SupportsLeAudioBroadcast();

};



/* Interface class */

system/bta/le_audio/hal_verifier.cc

+5 −0
Original line number Diff line number Diff line
@@ -26,3 +26,8 @@ bool LeAudioHalVerifier::SupportsLeAudioHardwareOffload() { 
  return bluetooth::audio::HalVersionManager::GetHalVersion() >

         bluetooth::audio::BluetoothAudioHalVersion::VERSION_2_1;

}



bool LeAudioHalVerifier::SupportsLeAudioBroadcast() {

  return bluetooth::audio::HalVersionManager::GetHalTransport() ==

         bluetooth::audio::BluetoothAudioHalTransport::AIDL;

}

system/bta/le_audio/hal_verifier_linux.cc

+1 −0
Original line number Diff line number Diff line
@@ -18,3 +18,4 @@ 


bool LeAudioHalVerifier::SupportsLeAudio() { return false; }

bool LeAudioHalVerifier::SupportsLeAudioHardwareOffload() { return false; }

bool LeAudioHalVerifier::SupportsLeAudioBroadcast() { return false; }

system/btif/src/btif_le_audio_broadcaster.cc

+2 −2
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <hardware/bt_le_audio.h>



#include "audio_hal_interface/hal_version_manager.h"

#include "bta_le_audio_api.h"

#include "bta_le_audio_broadcaster_api.h"

#include "btif_common.h"

#include "stack/include/btu.h"
@@ -46,8 +47,7 @@ class LeAudioBroadcasterInterfaceImpl : public LeAudioBroadcasterInterface, 
    do_in_main_thread(

        FROM_HERE,

        Bind(&LeAudioBroadcaster::Initialize, this, base::Bind([]() -> bool {

          return bluetooth::audio::HalVersionManager::GetHalVersion() ==

                 bluetooth::audio::BluetoothAudioHalVersion::VERSION_2_1;

          return LeAudioHalVerifier::SupportsLeAudioBroadcast();

        })));

  }

system/test/mock/mock_le_audio_hal_verifier.cc

+5 −0
Original line number Diff line number Diff line
@@ -29,3 +29,8 @@ bool LeAudioHalVerifier::SupportsLeAudioHardwareOffload() { 
  mock_function_count_map[__func__]++;

  return true;

}



bool LeAudioHalVerifier::SupportsLeAudioBroadcast() {

  mock_function_count_map[__func__]++;

  return true;

}