Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use AudioDeviceTypeAddrVector instead of Vector<AudioDeviceTypeAddr>"

Browse Source
This commit is contained in:
Eric Laurent
2020-12-22 11:10:19 +00:00
committed by Gerrit Code Review
parent ba3f1179a8 aea04ec44b
commit 8fe2d292b0
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/jni/android_media_AudioSystem.cpp
View File

@@ -310,7 +310,7 @@ static int _check_AudioSystem_Command(const char* caller, status_t status)
static jint getVectorOfAudioDeviceTypeAddr(JNIEnv *env, jintArray deviceTypes, static jint getVectorOfAudioDeviceTypeAddr(JNIEnv *env, jintArray deviceTypes,
jobjectArray deviceAddresses, jobjectArray deviceAddresses,
Vector<AudioDeviceTypeAddr> &audioDeviceTypeAddrVector) { AudioDeviceTypeAddrVector &audioDeviceTypeAddrVector) {
if (deviceTypes == nullptr || deviceAddresses == nullptr) { if (deviceTypes == nullptr || deviceAddresses == nullptr) {
return (jint)AUDIO_JAVA_BAD_VALUE; 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); const char *address = env->GetStringUTFChars((jstring)addrJobj, NULL);
AudioDeviceTypeAddr dev = AudioDeviceTypeAddr((audio_devices_t)typesPtr[i], address); AudioDeviceTypeAddr dev = AudioDeviceTypeAddr((audio_devices_t)typesPtr[i], address);
audioDeviceTypeAddrVector.add(dev); audioDeviceTypeAddrVector.push_back(dev);
env->ReleaseStringUTFChars((jstring)addrJobj, address); env->ReleaseStringUTFChars((jstring)addrJobj, address);
} }
env->ReleaseIntArrayElements(deviceTypes, typesPtr, 0); env->ReleaseIntArrayElements(deviceTypes, typesPtr, 0);
@@ -2063,7 +2063,7 @@ exit:
static jint android_media_AudioSystem_setUidDeviceAffinities(JNIEnv *env, jobject clazz, static jint android_media_AudioSystem_setUidDeviceAffinities(JNIEnv *env, jobject clazz,
jint uid, jintArray deviceTypes, jobjectArray deviceAddresses) { jint uid, jintArray deviceTypes, jobjectArray deviceAddresses) {
Vector<AudioDeviceTypeAddr> deviceVector; AudioDeviceTypeAddrVector deviceVector;
jint results = getVectorOfAudioDeviceTypeAddr(env, deviceTypes, deviceAddresses, deviceVector); jint results = getVectorOfAudioDeviceTypeAddr(env, deviceTypes, deviceAddresses, deviceVector);
if (results != NO_ERROR) { if (results != NO_ERROR) {
return results; 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, static jint android_media_AudioSystem_setUserIdDeviceAffinities(JNIEnv *env, jobject clazz,
jint userId, jintArray deviceTypes, jint userId, jintArray deviceTypes,
jobjectArray deviceAddresses) { jobjectArray deviceAddresses) {
Vector<AudioDeviceTypeAddr> deviceVector; AudioDeviceTypeAddrVector deviceVector;
jint results = getVectorOfAudioDeviceTypeAddr(env, deviceTypes, deviceAddresses, deviceVector); jint results = getVectorOfAudioDeviceTypeAddr(env, deviceTypes, deviceAddresses, deviceVector);
if (results != NO_ERROR) { if (results != NO_ERROR) {
return results; return results;