Refactor mixCriteria in AudioPolicyMix.
- use std::vector instead of android::Vector
- remove const qualifiers on setters (incorrect by definition)
- remove mutable specifier on mCriteria
- fix assignment to const pointer when actually changing the AudioMix
Bug: 233910083
Test: atest AudioServiceHostTest AudioHostTest AudioPolicyHostTest
Test: Refactoring cl, existing tests pass.
Change-Id: I140c41acbea0f5b88d71587d7633db4e7ceee847
Merged-In: I140c41acbea0f5b88d71587d7633db4e7ceee847
diff --git a/services/audiopolicy/tests/audiopolicymanager_tests.cpp b/services/audiopolicy/tests/audiopolicymanager_tests.cpp
index bb00c48..33a2429 100644
--- a/services/audiopolicy/tests/audiopolicymanager_tests.cpp
+++ b/services/audiopolicy/tests/audiopolicymanager_tests.cpp
@@ -966,10 +966,11 @@
status_t AudioPolicyManagerTestDynamicPolicy::addPolicyMix(int mixType, int mixFlag,
audio_devices_t deviceType, std::string mixAddress, const audio_config_t& audioConfig,
const std::vector<PolicyMixTuple>& rules) {
- Vector<AudioMixMatchCriterion> myMixMatchCriteria;
+ std::vector<AudioMixMatchCriterion> myMixMatchCriteria;
+ myMixMatchCriteria.reserve(rules.size());
for(const auto &rule: rules) {
- myMixMatchCriteria.add(AudioMixMatchCriterion(
+ myMixMatchCriteria.push_back(AudioMixMatchCriterion(
std::get<0>(rule), std::get<1>(rule), std::get<2>(rule)));
}