commit 329a406ed9b7349e7bdba083c7d768264336ace2
author Jungshik Jang <jayjang@google.com> Thu Sep 04 00:13:40 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Sep 04 00:13:42 2014 +0000
tree aea665a46ecc1c11720bc1bfa29c2a28055c57e6
parent a8d26e80bda1a4c31b8c36b6d65f51ab3f86d08c
parent 9ed982d42d943b373fb8f90841c61be6b2e92659

Merge "Rename ro.config.music_vol_steps into ro.config.media_vol_steps." 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 dd14c11..329033c 100644
--- a/media/java/android/media/AudioService.java
+++ b/media/java/android/media/AudioService.java
@@ -545,7 +545,7 @@
             "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",
+            "ro.config.media_vol_steps",
            MAX_STREAM_VOLUME[AudioSystem.STREAM_MUSIC]);
 
         sSoundEffectVolumeDb = context.getResources().getInteger(