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

Commit 70049351 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 12180713 from 41c946ae to 24Q4-release 

Change-Id: I10906332e9eb813c6f82f087fc3bdae442640104
parents d6b26481 41c946ae

bluetooth/audio/aidl/default/LeAudioOffloadAudioProvider.cpp

+1 −1
Original line number Diff line number Diff line
@@ -818,7 +818,7 @@ ndk::ScopedAStatus LeAudioOffloadAudioProvider::getLeAudioAseConfiguration( 
      auto matched_setting = matchWithRequirement(

          matched_ase_configuration_settings, requirement, false);

      if (matched_setting.has_value()) {

        result.push_back(matched_setting_with_context.value());

        result.push_back(matched_setting.value());

      } else {

        // Cannot find a match for this requirement

        // Immediately return

bluetooth/audio/aidl/vts/VtsHalBluetoothAudioTargetTest.cpp

+3 −0
Original line number Diff line number Diff line
@@ -142,6 +142,7 @@ enum class BluetoothAudioHalVersion : int32_t { 
  VERSION_AIDL_V2,

  VERSION_AIDL_V3,

  VERSION_AIDL_V4,

  VERSION_AIDL_V5,

};



// Some valid configs for HFP PCM configuration (software sessions)
@@ -683,6 +684,8 @@ class BluetoothAudioProviderFactoryAidl 
        return BluetoothAudioHalVersion::VERSION_AIDL_V3;

      case 4:

        return BluetoothAudioHalVersion::VERSION_AIDL_V4;

      case 5:

        return BluetoothAudioHalVersion::VERSION_AIDL_V5;

      default:

        return BluetoothAudioHalVersion::VERSION_UNAVAILABLE;

    }