Merge cherrypicks of ['googleplex-android-review.googlesource.com/30750708'] into 25Q1-release.
Change-Id: I5764307ec6bd3dc1d25057c1765e2be7e4aa72dd
diff --git a/services/audiopolicy/service/Spatializer.cpp b/services/audiopolicy/service/Spatializer.cpp
index d177b92..e469b2c 100644
--- a/services/audiopolicy/service/Spatializer.cpp
+++ b/services/audiopolicy/service/Spatializer.cpp
@@ -418,11 +418,13 @@
&spatializedChannelMasks);
if (status != NO_ERROR) {
ALOGW("%s: cannot get SPATIALIZER_PARAM_SPATIALIZED_CHANNEL_MASKS", __func__);
- return status;
+ // do not return an error yet as spatializer implementations may not have been
+ // updated yet to support this parameter
}
if (spatializedChannelMasks.empty()) {
ALOGW("%s: SPATIALIZER_PARAM_SPATIALIZED_CHANNEL_MASKS reports empty", __func__);
- return BAD_VALUE;
+ // do not return an error yet as spatializer implementations may not have been
+ // updated yet to support this parameter
}
for (const audio_channel_mask_t spatializedMask : spatializedChannelMasks) {
// spatialized masks must be contained in the supported input masks