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

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

Merge "HAL: Remove aidl_available cache" am: 0bf31926 

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



Change-Id: I59aa9bcdb778b5b7146351c589829e5156b18a20
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b28285c1 0bf31926

system/audio_hal_interface/aidl/client_interface_aidl.cc

+1 −6
Original line number Diff line number Diff line
@@ -54,12 +54,9 @@ BluetoothAudioClientInterface::BluetoothAudioClientInterface( 
}



bool BluetoothAudioClientInterface::is_aidl_available() {

  if (!aidl_available) return false;

  auto service = AServiceManager_checkService(

      kDefaultAudioProviderFactoryInterface.c_str());

  aidl_available = (service != nullptr);



  return aidl_available;

  return (service != nullptr);

}



std::vector<AudioCapabilities>
@@ -79,7 +76,6 @@ BluetoothAudioClientInterface::GetAudioCapabilities(SessionType session_type) { 


  if (provider_factory == nullptr) {

    LOG(ERROR) << __func__ << ", can't get capability from unknown factory";

    aidl_available = false;

    return capabilities;

  }
@@ -106,7 +102,6 @@ void BluetoothAudioClientInterface::FetchAudioProvider() { 


  if (provider_factory == nullptr) {

    LOG(ERROR) << __func__ << ", can't get capability from unknown factory";

    aidl_available = false;

    return;

  }

system/audio_hal_interface/aidl/client_interface_aidl.h

+0 −1
Original line number Diff line number Diff line
@@ -117,7 +117,6 @@ class BluetoothAudioClientInterface { 
      std::string() + IBluetoothAudioProviderFactory::descriptor + "/default";



 private:

  static inline bool aidl_available = true;

  IBluetoothTransportInstance* transport_;

  std::vector<AudioCapabilities> capabilities_;

  bool is_low_latency_allowed_{false};