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

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

Merge "floss: Fix more LeAudio related build issues" am: 6950d2e8 am: fe8ba89a am: fb00fe49 

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

Change-Id: Ic9d4f2fc3ee5611a007b1c9757b6380a7303131c
parents 12533b67 fb00fe49

system/btif/src/bluetooth.cc

+4 −0
Original line number Diff line number Diff line
@@ -426,7 +426,9 @@ static void dump(int fd, const char** arguments) { 
  osi_allocator_debug_dump(fd);

  alarm_debug_dump(fd);

  bluetooth::csis::CsisClient::DebugDump(fd);

#ifndef TARGET_FLOSS

  le_audio::has::HasClient::DebugDump(fd);

#endif

  HearingAid::DebugDump(fd);

#ifndef TARGET_FLOSS

  LeAudioClient::DebugDump(fd);
@@ -487,8 +489,10 @@ static const void* get_profile_interface(const char* profile_id) { 
  if (is_profile(profile_id, BT_PROFILE_HEARING_AID_ID))

    return btif_hearing_aid_get_interface();



#ifndef TARGET_FLOSS

  if (is_profile(profile_id, BT_PROFILE_HAP_CLIENT_ID))

    return btif_has_client_get_interface();

#endif



  if (is_profile(profile_id, BT_KEYSTORE_ID))

    return bluetooth::bluetooth_keystore::getBluetoothKeystoreInterface();

system/btif/src/btif_storage.cc

+4 −0
Original line number Diff line number Diff line
@@ -1945,8 +1945,12 @@ void btif_storage_load_bonded_leaudio_has_devices() { 
    uint8_t features = 0;

    if (btif_config_get_int(name, HAS_FEATURES, &value)) features = value;



#ifndef TARGET_FLOSS

    do_in_main_thread(FROM_HERE, Bind(&le_audio::has::HasClient::AddFromStorage,

                                      bd_addr, features, is_acceptlisted));

#else

    ASSERT_LOG(false, "TODO - Fix LE audio build.");

#endif

  }

}