diff options
| author | jiabin <jiabin@google.com> | 2020-08-07 11:39:19 -0700 |
|---|---|---|
| committer | Eric Laurent <elaurent@google.com> | 2020-12-21 16:21:15 +0100 |
| commit | aea04ec44b3f53de079f17c2d32f994f01721c2f (patch) | |
| tree | 7f5f01abb776868df92082132e5f647f2c3fbecb | |
| parent | 96db3dad2a4a1c4f1622a2b268b347cda0e808db (diff) | |
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
Merged-In: Ib48056d6c332ae5eb006e0e12a80c8505c7313d8
| -rw-r--r-- | core/jni/android_media_AudioSystem.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/jni/android_media_AudioSystem.cpp b/core/jni/android_media_AudioSystem.cpp index 7493e39538dc..c4a06567c48d 100644 --- a/core/jni/android_media_AudioSystem.cpp +++ b/core/jni/android_media_AudioSystem.cpp @@ -310,7 +310,7 @@ static int _check_AudioSystem_Command(const char* caller, status_t status) 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 @@ static jint getVectorOfAudioDeviceTypeAddr(JNIEnv *env, jintArray deviceTypes, } const char *address = env->GetStringUTFChars((jstring)addrJobj, NULL); AudioDeviceTypeAddr dev = AudioDeviceTypeAddr((audio_devices_t)typesPtr[i], address); - audioDeviceTypeAddrVector.add(dev); + audioDeviceTypeAddrVector.push_back(dev); env->ReleaseStringUTFChars((jstring)addrJobj, address); } env->ReleaseIntArrayElements(deviceTypes, typesPtr, 0); @@ -2063,7 +2063,7 @@ exit: 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; @@ -2081,7 +2081,7 @@ static jint android_media_AudioSystem_removeUidDeviceAffinities(JNIEnv *env, job 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; |