Do not invalidate stream when the secondary outputs are changed.
When a dynamic policy is registered, the secondary outputs may be
changed. Instead of tearing down the tracks, only tracks whose secondary
outputs are changed will be updated with the new secondary outputs.
Bug: 181582467
Bug: 174123397
Test: atest AudioPlaybackCaptureTest audiopolicy_tests
Test: repo steps in the bug
Change-Id: I9a47a0a4b37ad3f4a1d554dd726ebffb27325141
(cherry picked from commit 10a03f1713e29eadfa862087e504f9e14964387e)
diff --git a/media/libaudioclient/IAudioFlinger.cpp b/media/libaudioclient/IAudioFlinger.cpp
index 389b73f..0564cdf 100644
--- a/media/libaudioclient/IAudioFlinger.cpp
+++ b/media/libaudioclient/IAudioFlinger.cpp
@@ -743,6 +743,16 @@
return statusTFromBinderStatus(mDelegate->setVibratorInfos(vibratorInfos));
}
+status_t AudioFlingerClientAdapter::updateSecondaryOutputs(
+ const TrackSecondaryOutputsMap& trackSecondaryOutputs) {
+ std::vector<media::TrackSecondaryOutputInfo> trackSecondaryOutputInfos =
+ VALUE_OR_RETURN_STATUS(
+ convertContainer<std::vector<media::TrackSecondaryOutputInfo>>(
+ trackSecondaryOutputs,
+ legacy2aidl_TrackSecondaryOutputInfoPair_TrackSecondaryOutputInfo));
+ return statusTFromBinderStatus(mDelegate->updateSecondaryOutputs(trackSecondaryOutputInfos));
+}
+
////////////////////////////////////////////////////////////////////////////////////////////////////
// AudioFlingerServerAdapter
@@ -1199,4 +1209,13 @@
return Status::fromStatusT(mDelegate->setVibratorInfos(vibratorInfos));
}
+Status AudioFlingerServerAdapter::updateSecondaryOutputs(
+ const std::vector<media::TrackSecondaryOutputInfo>& trackSecondaryOutputInfos) {
+ TrackSecondaryOutputsMap trackSecondaryOutputs =
+ VALUE_OR_RETURN_BINDER(convertContainer<TrackSecondaryOutputsMap>(
+ trackSecondaryOutputInfos,
+ aidl2legacy_TrackSecondaryOutputInfo_TrackSecondaryOutputInfoPair));
+ return Status::fromStatusT(mDelegate->updateSecondaryOutputs(trackSecondaryOutputs));
+}
+
} // namespace android