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

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

[AudioServer][Strategies] Fix Min/Max index overwritting 



When a strategy holds 2 stream types, following the same volume group
(aka same volume curves), when audioservice initializes, it may
overwritte the Min/max for the volume group.

This is due to the fact that the second stream type is not recognized
and falls back on default volume group (aka Music). So, Min/max are
overwritten with music Min/max.

This CL fixes the bug by formatting correctly the AudioAttributesGroups
of a product strategy by checking not only the volume group id but
also the stream type.

Test: build & 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: I3aab572ef4daeecce13bbcef6278edcc42b7d594
Merged-In: I3aab572ef4daeecce13bbcef6278edcc42b7d594
Signed-off-by: default avatarFrançois Gaffie <francois.gaffie@renault.com>
parent adcbf900

core/jni/android_media_AudioProductStrategies.cpp

+17 −4
Original line number Diff line number Diff line
@@ -85,10 +85,23 @@ static jint convertAudioProductStrategiesFromNative( 
    jStrategyId = static_cast<jint>(strategy.getId());



    // Audio Attributes Group array

    std::map<int, std::vector<AudioAttributes> > groups;

    int attrGroupIndex = 0;

    std::map<int /**attributesGroupIndex*/, std::vector<AudioAttributes> > groups;

    for (const auto &attr : strategy.getAudioAttributes()) {

        int attrGroupId = attr.getGroupId();

        groups[attrGroupId].push_back(attr);

        int groupId = attr.getGroupId();

        int streamType = attr.getStreamType();

        const auto &iter = std::find_if(begin(groups), end(groups),

                                        [groupId, streamType](const auto &iter) {

            const auto &frontAttr = iter.second.front();

            return frontAttr.getGroupId() == groupId && frontAttr.getStreamType() == streamType;

        });

        // Same Volume Group Id and same stream type

        if (iter != end(groups)) {

             groups[iter->first].push_back(attr);

        } else {

            // Add a new Group of AudioAttributes for this product strategy

            groups[attrGroupIndex++].push_back(attr);

        }

    }

    numAttributesGroups = groups.size();
@@ -97,7 +110,7 @@ static jint convertAudioProductStrategiesFromNative( 
    for (const auto &iter : groups) {

        std::vector<AudioAttributes> audioAttributesGroups = iter.second;

        jint numAttributes = audioAttributesGroups.size();

        jint jGroupId = iter.first;

        jint jGroupId = audioAttributesGroups.front().getGroupId();

        jint jLegacyStreamType = audioAttributesGroups.front().getStreamType();



        jStatus = JNIAudioAttributeHelper::getJavaArray(env, &jAudioAttributes, numAttributes);