Merge "AudioService: check safe volume bypass early at boot"

2017-02-10 05:12:01 +00:00
parent 081a9a7593 03332ab6aa
commit f96393ad2f
1 changed files with 2 additions and 1 deletions
--- a/services/core/java/com/android/server/audio/AudioService.java
+++ b/services/core/java/com/android/server/audio/AudioService.java
@@ -778,7 +778,8 @@ public class AudioService extends IAudioService.Stub
                0,
                0,
                TAG,
-                SAFE_VOLUME_CONFIGURE_TIMEOUT_MS);
+                SystemProperties.getBoolean("audio.safemedia.bypass", false) ?
+                        0 : SAFE_VOLUME_CONFIGURE_TIMEOUT_MS);

        initA11yMonitoring();
        onIndicateSystemReady();