Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 36281e9e authored by Robert Wu's avatar Robert Wu
Browse files

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
parent 13280939

core/jni/android_media_AudioRecord.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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;

core/jni/android_media_AudioTrack.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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;

media/jni/android_media_MediaPlayer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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;

media/jni/android_media_MediaRecorder.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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;