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

Commit 91b94092 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Audio: fix AudioVolumeGroup JNI" am: 0e2e9bb9 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2600926



Change-Id: I001c0a945416f448eb5fd96bf06f189368c28a7d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 16b0d2bc 0e2e9bb9

core/jni/android_media_AudioVolumeGroups.cpp

+5 −0
Original line number Diff line number Diff line
@@ -94,6 +94,11 @@ static jint convertAudioVolumeGroupsFromNative( 
    for (size_t j = 0; j < static_cast<size_t>(numAttributes); j++) {

        auto attributes = group.getAudioAttributes()[j];



        // Native & Java audio attributes default initializers are not aligned for the source.

        // Given the volume group class concerns only playback, this field must be equal to the

        // default java initializer.

        attributes.source = AUDIO_SOURCE_INVALID;



        jStatus = JNIAudioAttributeHelper::nativeToJava(env, &jAudioAttribute, attributes);

        if (jStatus != AUDIO_JAVA_SUCCESS) {

            goto exit;