commit e8f8bc0ad6f7f2c657b4360033d2c7571c800ccb
author Jungshik Jang <jayjang@google.com> Tue Sep 02 23:20:29 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Sep 02 23:20:32 2014 +0000
tree 5f64a3068f03030affccc2eabb069d2e8bc0bd83
parent 3d3f5f8c688fbaaf251cfde0ed04507279d9cadb
parent 32069a1292345b29484079ede47ca92fa87c2448

Merge "Make stream_music volume configurable." into lmp-dev

media/java/android/media/AudioService.java

diff --git a/media/java/android/media/AudioService.java b/media/java/android/media/AudioService.java
index d15085b..dd14c11 100644
--- a/media/java/android/media/AudioService.java
+++ b/media/java/android/media/AudioService.java
@@ -544,6 +544,9 @@
         MAX_STREAM_VOLUME[AudioSystem.STREAM_VOICE_CALL] = SystemProperties.getInt(
             "ro.config.vc_call_vol_steps",
            MAX_STREAM_VOLUME[AudioSystem.STREAM_VOICE_CALL]);
+        MAX_STREAM_VOLUME[AudioSystem.STREAM_MUSIC] = SystemProperties.getInt(
+            "ro.config.music_vol_steps",
+           MAX_STREAM_VOLUME[AudioSystem.STREAM_MUSIC]);
 
         sSoundEffectVolumeDb = context.getResources().getInteger(
                 com.android.internal.R.integer.config_soundEffectVolumeDb);