am 115284bc: Merge "Support volume-changed sounds on master-volume-only configs"...

* commit '115284bc124ce2874f32ad36956f475959513388':
  Support volume-changed sounds on master-volume-only configs

diff --cc core/java/android/view/VolumePanel.java
Simple merge

diff --cc media/java/android/media/AudioManager.java
index 43c5e86,1c58d7a..3194e95
--- 1/media/java/android/media/AudioManager.java
--- 2/media/java/android/media/AudioManager.java
+++ b/media/java/android/media/AudioManager.java
@@@ -506,11 -506,13 +504,9 @@@ public class AudioManager 
                   */
                  if (mUseVolumeKeySounds) {
                      if (mUseMasterVolume) {
-                         if (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN) {
-                             adjustMasterVolume(ADJUST_SAME, FLAG_PLAY_SOUND);
-                         }
+                         adjustMasterVolume(ADJUST_SAME, FLAG_PLAY_SOUND);
                      } else {
                          int flags = FLAG_PLAY_SOUND;
 -                        if (mVolumeControlStream != -1) {
 -                            stream = mVolumeControlStream;
 -                            flags |= FLAG_FORCE_STREAM;
 -                        }
                          adjustSuggestedStreamVolume(
                                  ADJUST_SAME,
                                  stream,