| commit | c0be4b0743222ef9eab65f95d522cb82b7c2ee92 | [log] [tgz] |
|---|---|---|
| author | Bao Do <quocbaodo@google.com> | Mon Jan 13 19:31:04 2025 -0800 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jan 13 19:31:04 2025 -0800 |
| tree | 67d7f6300db0c2dd6f7bee430916d482021d6cf8 | |
| parent | e4da126fda4dc2973a55772cd937cf53373ad314 [diff] | |
| parent | 17d2895801b0a32a09646e6d1c8387024629dc75 [diff] |
Merge "Fix broken failure condition when populating ase configurtion." into main am: 358509c1bd am: 17d2895801 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3448929 Change-Id: I904f301b280291daa885f24dfe8857fb8225645d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/bluetooth/audio/utils/aidl_session/BluetoothLeAudioAseConfigurationSettingProvider.cpp b/bluetooth/audio/utils/aidl_session/BluetoothLeAudioAseConfigurationSettingProvider.cpp index 5909c92..3e18de2 100644 --- a/bluetooth/audio/utils/aidl_session/BluetoothLeAudioAseConfigurationSettingProvider.cpp +++ b/bluetooth/audio/utils/aidl_session/BluetoothLeAudioAseConfigurationSettingProvider.cpp
@@ -674,14 +674,14 @@ configurationFlags.bitmask |= ConfigurationFlags::ALLOW_ASYMMETRIC_CONFIGURATIONS; } + } + } else { + if (codec_cfg == nullptr) { + LOG(ERROR) << "No codec config matching key " << codec_config_key.c_str() + << " found"; } else { - if (codec_cfg == nullptr) { - LOG(ERROR) << "No codec config matching key " - << codec_config_key.c_str() << " found"; - } else { - LOG(ERROR) << "Configuration '" << flat_cfg->name()->c_str() - << "' has no valid subconfigurations."; - } + LOG(ERROR) << "Configuration '" << flat_cfg->name()->c_str() + << "' has no valid subconfigurations."; } } }