commit 0b5532967daae8a6d801e1f1c3a2e853b0022043
author jiabin <jiabin@google.com> Fri Aug 07 11:39:19 2020 -0700
committer jiabin <jiabin@google.com> Fri Aug 07 21:46:39 2020 -0700
tree 9d4047458e9df49a06da790cbb7ac1a3ad9d7673
parent 19293693e8a0ac7d2dca4ab37be113e895b3d337

Use AudioDeviceTypeAddrVector instead of Vector<AudioDeviceTypeAddr>

AudioDeviceTypeAddrVector is std::vector<AudioDeviceTypeAddr>. Using
AudioDeviceTypeAddrVector is more convenient for binder call. In this
change, AudioDeviceTypeAddrVector is used for setUidDeviceAffinities and
setUserIdDeviceAffinities.

Test: atest AudioHostTest
Test: atest AudioServiceHostTest
Test: atest audiopolicy_tests
Bug: 160352965
Change-Id: Ib48056d6c332ae5eb006e0e12a80c8505c7313d8

core/jni/android_media_AudioSystem.cpp

diff --git a/core/jni/android_media_AudioSystem.cpp b/core/jni/android_media_AudioSystem.cpp
index 1f62544..aad6835 100644
--- a/core/jni/android_media_AudioSystem.cpp
+++ b/core/jni/android_media_AudioSystem.cpp
@@ -310,7 +310,7 @@
 
 static jint getVectorOfAudioDeviceTypeAddr(JNIEnv *env, jintArray deviceTypes,
                                            jobjectArray deviceAddresses,
-                                           Vector<AudioDeviceTypeAddr> &audioDeviceTypeAddrVector) {
+                                           AudioDeviceTypeAddrVector &audioDeviceTypeAddrVector) {
     if (deviceTypes == nullptr || deviceAddresses == nullptr) {
         return (jint)AUDIO_JAVA_BAD_VALUE;
     }
@@ -337,7 +337,7 @@
         }
         const char *address = env->GetStringUTFChars((jstring)addrJobj, NULL);
         AudioDeviceTypeAddr dev = AudioDeviceTypeAddr(typesPtr[i], address);
-        audioDeviceTypeAddrVector.add(dev);
+        audioDeviceTypeAddrVector.push_back(dev);
         env->ReleaseStringUTFChars((jstring)addrJobj, address);
     }
     env->ReleaseIntArrayElements(deviceTypes, typesPtr, 0);
@@ -2062,7 +2062,7 @@
 
 static jint android_media_AudioSystem_setUidDeviceAffinities(JNIEnv *env, jobject clazz,
         jint uid, jintArray deviceTypes, jobjectArray deviceAddresses) {
-    Vector<AudioDeviceTypeAddr> deviceVector;
+    AudioDeviceTypeAddrVector deviceVector;
     jint results = getVectorOfAudioDeviceTypeAddr(env, deviceTypes, deviceAddresses, deviceVector);
     if (results != NO_ERROR) {
         return results;
@@ -2080,7 +2080,7 @@
 static jint android_media_AudioSystem_setUserIdDeviceAffinities(JNIEnv *env, jobject clazz,
                                                                 jint userId, jintArray deviceTypes,
                                                                 jobjectArray deviceAddresses) {
-    Vector<AudioDeviceTypeAddr> deviceVector;
+    AudioDeviceTypeAddrVector deviceVector;
     jint results = getVectorOfAudioDeviceTypeAddr(env, deviceTypes, deviceAddresses, deviceVector);
     if (results != NO_ERROR) {
         return results;