diff options
| author | Ricardo Garcia <rago@google.com> | 2015-06-24 00:24:40 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-24 00:24:44 +0000 |
| commit | 2eab06c38f1aa34f90c2a4b153a51f3c15310431 (patch) | |
| tree | d9ccb1ac9bf15a5d3a8be854d3d6226aedb2d951 | |
| parent | c686757a183028deef5f27ed6c0412417f59cf35 (diff) | |
| parent | 3a30a76e8839d36c93c2620188238b84462b3dd2 (diff) | |
| download | frameworks_base-2eab06c38f1aa34f90c2a4b153a51f3c15310431.zip frameworks_base-2eab06c38f1aa34f90c2a4b153a51f3c15310431.tar.gz frameworks_base-2eab06c38f1aa34f90c2a4b153a51f3c15310431.tar.bz2 | |
Merge "Fix for SafeMedia logic and CTS tests" into mnc-dev
| -rw-r--r-- | services/core/java/com/android/server/audio/AudioService.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java index 47d3bde..0dc4076 100644 --- a/services/core/java/com/android/server/audio/AudioService.java +++ b/services/core/java/com/android/server/audio/AudioService.java @@ -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 |