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

Commit 15dd4281 authored by Oscar Azucena's avatar Oscar Azucena
Browse files

Clean internal call from constructor 

Removed get audio product strategies call method to audio service from
audio service constructor.

Bug: 432911065
Bug: 316643994
Flag: EXEMPT bug fix
Test: atest AudioManagerTest
Change-Id: I61f14e7e6f7252a80af8b75c233b42a81ff44a87
parent 44a60618

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

+5 −5
Original line number Diff line number Diff line
@@ -600,7 +600,7 @@ public class AudioService extends IAudioService.Stub 
            return groupId;

        }

        return AudioProductStrategy.getVolumeGroupIdForStreamType(

                getAudioProductStrategies(/* filterInternal= */ true), stream);

                mAudioSystem.getAudioProductStrategies(/* filterInternal= */ true), stream);

    }















    /**










@@ -1496,7 +1496,8 @@ public class AudioService extends IAudioService.Stub













        // Priority 1 - Android Property















        // Priority 2 - Audio Policy Service















        // Priority 3 - Default Value













        if (!mAudioSystem.getAudioProductStrategies(/* filterInternal= */ true).isEmpty()) {













        var productStrategies = mAudioSystem.getAudioProductStrategies(/* filterInternal*/ true);













        if (!productStrategies.isEmpty()) {















            int numStreamTypes = AudioSystem.getNumStreamTypes();





























            for (int streamType = numStreamTypes - 1; streamType >= 0; streamType--) {









@@ -1505,7 +1506,7 @@ public class AudioService extends IAudioService.Stub



























                if (volumeGroupManagementUpdate()) {















                    int groupId = AudioProductStrategy.getVolumeGroupIdForStreamType(













                            getAudioProductStrategies(/* filterInternal= */ true), streamType);













                            productStrategies, streamType);















                    if (groupId != AudioVolumeGroup.DEFAULT_VOLUME_GROUP) {















                        maxVolume = AudioSystem.getMaxVolumeIndexForGroup(groupId);















                        minVolume = AudioSystem.getMinVolumeIndexForGroup(groupId);









@@ -1513,8 +1514,7 @@ public class AudioService extends IAudioService.Stub













                } else {















                    AudioAttributes attr =















                            AudioProductStrategy.getAudioAttributesForStrategyWithLegacyStreamType(













                                    mAudioSystem.getAudioProductStrategies(













                                            /* filterInternal*/ true), streamType);













                                    productStrategies, streamType);















                    maxVolume = AudioSystem.getMaxVolumeIndexForAttributes(attr);















                    minVolume = AudioSystem.getMinVolumeIndexForAttributes(attr);















                }