commit c1afe3ba438699122aa2c3a66c3c58e87dd5525b
author jiabin <jiabin@google.com> Fri Aug 07 11:56:38 2020 -0700
committer Eric Laurent <elaurent@google.com> Mon Dec 21 16:28:18 2020 +0100
tree 1c1290b565c6989d90f91b00f6005176e74aa28c
parent d295e4b4bdc617ebdeb36deb97cb9597a5e603f1

Use AudioDeviceTypeAddrVector instead of Vector<AudioDeviceTypeAddr>

AudioDeviceTypeAddrVector is std::vector<AudioDeviceTypeAddr>. In that
case, it is not needed to use Vector<AudioDeviceTypeAddr>. It is also
suggested to use the std::vector instead of Vector.

Test: atest AudioHostTest
Test: atest AudioServiceHostTest
Test: atest audiopolicy_tests
Bug: 160352965
Change-Id: Ibcd91fcba95c53e3c172ae62fc6f30e70509de51
Merged-In: Ibcd91fcba95c53e3c172ae62fc6f30e70509de51

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
index a8fdedf..56fa558 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -3096,7 +3096,7 @@
 
 // Returns true if all devices types match the predicate and are supported by one HW module
 bool  AudioPolicyManager::areAllDevicesSupported(
-        const Vector<AudioDeviceTypeAddr>& devices,
+        const AudioDeviceTypeAddrVector& devices,
         std::function<bool(audio_devices_t)> predicate,
         const char *context) {
     for (size_t i = 0; i < devices.size(); i++) {
@@ -3113,7 +3113,7 @@
 }
 
 status_t AudioPolicyManager::setUidDeviceAffinities(uid_t uid,
-        const Vector<AudioDeviceTypeAddr>& devices) {
+        const AudioDeviceTypeAddrVector& devices) {
     ALOGV("%s() uid=%d num devices %zu", __FUNCTION__, uid, devices.size());
     if (!areAllDevicesSupported(devices, audio_is_output_device, __func__)) {
         return BAD_VALUE;
@@ -3150,8 +3150,8 @@
     ALOGV("%s() strategy=%d device=%08x addr=%s", __FUNCTION__,
             strategy, device.mType, device.mAddress.c_str());
 
-    Vector<AudioDeviceTypeAddr> devices;
-    devices.add(device);
+    AudioDeviceTypeAddrVector devices;
+    devices.push_back(device);
     if (!areAllDevicesSupported(devices, audio_is_output_device, __func__)) {
         return BAD_VALUE;
     }
@@ -3216,8 +3216,8 @@
 }
 
 status_t AudioPolicyManager::setUserIdDeviceAffinities(int userId,
-        const Vector<AudioDeviceTypeAddr>& devices) {
-    ALOGI("%s() userId=%d num devices %zu", __FUNCTION__, userId, devices.size());\
+        const AudioDeviceTypeAddrVector& devices) {
+    ALOGI("%s() userId=%d num devices %zu", __func__, userId, devices.size());
     if (!areAllDevicesSupported(devices, audio_is_output_device, __func__)) {
         return BAD_VALUE;
     }