Fix incrementing with getDeviceIds

Counters are incremented twice which causes some devices to not
show up in PlaybackActivityMonitor

Bug: 395900379
Test: Play an alarm with a bluetooth headset connected
Test: adb shell dumpsys audio
Flag: EXEMPT bugfix
Change-Id: Iad7398316a7d51de6deb0da343ed545181f7b6be

4 files changed, 4 insertions, 4 deletions

diff --git a/core/jni/android_media_AudioRecord.cpp b/core/jni/android_media_AudioRecord.cpp
index 5a183925e38e..89c3fb6b747b 100644
--- a/core/jni/android_media_AudioRecord.cpp
+++ b/core/jni/android_media_AudioRecord.cpp
@@ -597,7 +597,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 5d4d1ce20e5d..f783fb0e79d6 100644
--- a/core/jni/android_media_AudioTrack.cpp
+++ b/core/jni/android_media_AudioTrack.cpp
@@ -1203,7 +1203,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 a94230014437..b3704e1e6c3a 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;