Merge "Fix incrementing with getDeviceIds" into main

4 files changed, 4 insertions, 4 deletions

diff --git a/core/jni/android_media_AudioRecord.cpp b/core/jni/android_media_AudioRecord.cpp
index 102edc944c22..22298b3f9525 100644
--- a/core/jni/android_media_AudioRecord.cpp
+++ b/core/jni/android_media_AudioRecord.cpp
@@ -598,7 +598,7 @@ static jintArray android_media_AudioRecord_getRoutedDeviceIds(JNIEnv *env, jobje
     }
     jint *values = env->GetIntArrayElements(result, 0);
     for (unsigned int i = 0; i < deviceIds.size(); i++) {
-        values[i++] = static_cast<jint>(deviceIds[i]);
+        values[i] = static_cast<jint>(deviceIds[i]);
     }
     env->ReleaseIntArrayElements(result, values, 0);
     return result;
diff --git a/core/jni/android_media_AudioTrack.cpp b/core/jni/android_media_AudioTrack.cpp
index 3fc1a02f46b6..3cf5d5fdde24 100644
--- a/core/jni/android_media_AudioTrack.cpp
+++ b/core/jni/android_media_AudioTrack.cpp
@@ -1204,7 +1204,7 @@ static jintArray android_media_AudioTrack_getRoutedDeviceIds(JNIEnv *env, jobjec
     }
     jint *values = env->GetIntArrayElements(result, 0);
     for (unsigned int i = 0; i < deviceIds.size(); i++) {
-        values[i++] = static_cast<jint>(deviceIds[i]);
+        values[i] = static_cast<jint>(deviceIds[i]);
     }
     env->ReleaseIntArrayElements(result, values, 0);
     return result;
diff --git a/media/jni/android_media_MediaPlayer.cpp b/media/jni/android_media_MediaPlayer.cpp
index 647b55353257..9d197f48ed8d 100644
--- a/media/jni/android_media_MediaPlayer.cpp
+++ b/media/jni/android_media_MediaPlayer.cpp
@@ -1378,7 +1378,7 @@ static jintArray android_media_MediaPlayer_getRoutedDeviceIds(JNIEnv *env, jobje
     }
     jint* values = env->GetIntArrayElements(result, 0);
     for (unsigned int i = 0; i < deviceIds.size(); i++) {
-        values[i++] = static_cast<jint>(deviceIds[i]);
+        values[i] = static_cast<jint>(deviceIds[i]);
     }
     env->ReleaseIntArrayElements(result, values, 0);
     return result;
diff --git a/media/jni/android_media_MediaRecorder.cpp b/media/jni/android_media_MediaRecorder.cpp
index 643fc8a2d925..2975a39c5fa5 100644
--- a/media/jni/android_media_MediaRecorder.cpp
+++ b/media/jni/android_media_MediaRecorder.cpp
@@ -743,7 +743,7 @@ android_media_MediaRecorder_getRoutedDeviceIds(JNIEnv *env, jobject thiz)
     }
     jint* values = env->GetIntArrayElements(result, 0);
     for (unsigned int i = 0; i < deviceIds.size(); i++) {
-        values[i++] = static_cast<jint>(deviceIds[i]);
+        values[i] = static_cast<jint>(deviceIds[i]);
     }
     env->ReleaseIntArrayElements(result, values, 0);
     return result;