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

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

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

Change-Id: I001c0a945416f448eb5fd96bf06f189368c28a7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-05-23 19:59:09 +00:00
committed by Automerger Merge Worker
parent 16b0d2bcb5 0e2e9bb93c
commit 91b94092e5
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/jni/android_media_AudioVolumeGroups.cpp
View File

@@ -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;