libaudiohal: do not erase port configs if resetting fails
If the resetAudioPortConfig() returns failure, do not erase its
port configs in AIDL. Otherwise, the config of the framework and
HAL will not match, and the audio patch will never be reset properly.
Bug: 348099828
Test: repro steps from the bug
Change-Id: I69ba25bc84baff1d1f2d11533ab8bbe2c7bb0889
diff --git a/media/libaudiohal/impl/Hal2AidlMapper.cpp b/media/libaudiohal/impl/Hal2AidlMapper.cpp
index cbade70..07a1e18 100644
--- a/media/libaudiohal/impl/Hal2AidlMapper.cpp
+++ b/media/libaudiohal/impl/Hal2AidlMapper.cpp
@@ -914,6 +914,7 @@
!status.isOk()) {
ALOGE("%s: error while resetting port config %d: %s",
__func__, portConfigId, status.getDescription().c_str());
+ return;
}
mPortConfigs.erase(it);
return;