commit 10bfdb5c4f1dfa299b308fa2e5ff18c9d5a6bf8f
author Nino Jagar <njagar@google.com> Tue May 23 21:00:40 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue May 23 21:00:40 2023 +0000
tree f4b2e134a90304654675bcdc349dbfb5b264f18e
parent 0e2e9bb93c9af9661fe6671dd3dc18d8a50a07c7
parent efdde207daa7c4a0c92f88e9994bd75703db9880

Merge "Add missing owners for content capture and protection"

core/jni/android_media_AudioVolumeGroups.cpp

diff --git a/core/jni/android_media_AudioVolumeGroups.cpp b/core/jni/android_media_AudioVolumeGroups.cpp
index 7098451..1252e89 100644
--- a/core/jni/android_media_AudioVolumeGroups.cpp
+++ b/core/jni/android_media_AudioVolumeGroups.cpp
@@ -94,6 +94,11 @@
     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;