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

Commit 3a30a76e authored by Ricardo Garcia's avatar Ricardo Garcia
Browse files

Fix for SafeMedia logic and CTS tests 

Added audio.safemedia.bypass system property to bypass SafeMedia logic on
CTS tests which require guaranteed access to full range of volume levels.

bug: 21779099
Change-Id: I76815a995f08d426218206af7aade491c5debd9e
parent e6953913

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

+4 −1
Original line number Diff line number Diff line
@@ -3099,10 +3099,13 @@ public class AudioService extends IAudioService.Stub { 
                        || mContext.getResources().getBoolean(

                                com.android.internal.R.bool.config_safe_media_volume_enabled);



                boolean safeMediaVolumeBypass =

                        SystemProperties.getBoolean("audio.safemedia.bypass", false);



                // The persisted state is either "disabled" or "active": this is the state applied

                // next time we boot and cannot be "inactive"

                int persistedState;

                if (safeMediaVolumeEnabled) {

                if (safeMediaVolumeEnabled && !safeMediaVolumeBypass) {

                    persistedState = SAFE_MEDIA_VOLUME_ACTIVE;

                    // The state can already be "inactive" here if the user has forced it before

                    // the 30 seconds timeout for forced configuration. In this case we don't reset