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

Commit bb58b4e6 authored by François Gaffie's avatar François Gaffie Committed by Eric Laurent
Browse files

[AudioServer] Fix CTS for volume groups based on non public streams 

This CL fixes VolumeGroup CTS by preventing to set the volume per
stream for group associated to a non public stream type.

Bug: 136121584
Test: run cts-dev -m CtsMediaTestCase --test android.media.cts.AudioProductStrategyTest
run cts-dev -m CtsMediaTestCase --test android.media.cts.AudioVolumeGroupTest
run cts-dev -m CtsMediaTestCase --test android.media.cts.AudioVolumeGroupChangeHandlerTest
run cts-dev -m CtsMediaTestCase --test android.media.cts.AudioManagerTest#testPermissionsForVolumePerAttributes
run cts-dev -m CtsMediaTestCase --test android.media.cts.AudioManagerTest#testGetAndValidateProductStrategies
run cts-dev -m CtsMediaTestCase --test android.media.cts.AudioManagerTest#testGetAndValidateVolumeGroups
run cts-dev -m CtsMediaTestCase --test android.media.cts.AudioManagerTest#testSetGetVolumePerAttributesWithInvalidAttributes
run cts-dev -m CtsMediaTestCase --test android.media.cts.AudioManagerTest#testSetGetVolumePerAttributes
run cts-dev -m CtsMediaTestCase --test android.media.cts.AudioManagerTest#testVolumeGroupCallback

Change-Id: I53d9d2d4d7591300bf364d591412b548356cd118
parent aad7d93e

services/core/java/com/android/server/audio/AudioService.java

+7 −0
Original line number Diff line number Diff line
@@ -2325,6 +2325,13 @@ public class AudioService extends IAudioService.Stub 


        // For legacy reason, propagate to all streams associated to this volume group

        for (final int groupedStream : vgs.getLegacyStreamTypes()) {

            try {

                ensureValidStreamType(groupedStream);

            } catch (IllegalArgumentException e) {

                Log.d(TAG, "volume group " + volumeGroup + " has internal streams (" + groupedStream

                        + "), do not change associated stream volume");

                continue;

            }

            setStreamVolume(groupedStream, index, flags, callingPackage, callingPackage,

                            Binder.getCallingUid());

        }