diff --git a/media/java/android/media/AudioSystem.java b/media/java/android/media/AudioSystem.java
index 7c893d0e0fc..9f3cf39b09d 100644
--- a/media/java/android/media/AudioSystem.java
+++ b/media/java/android/media/AudioSystem.java
@@ -882,17 +882,17 @@ public class AudioSystem
}
public static int[] DEFAULT_STREAM_VOLUME = new int[] {
- 4, // STREAM_VOICE_CALL
+ 5, // STREAM_VOICE_CALL
7, // STREAM_SYSTEM
- 5, // STREAM_RING
- 5, // STREAM_MUSIC
- 6, // STREAM_ALARM
- 5, // STREAM_NOTIFICATION
- 7, // STREAM_BLUETOOTH_SCO
+ 7, // STREAM_RING
+ 15, // STREAM_MUSIC
+ 7, // STREAM_ALARM
+ 7, // STREAM_NOTIFICATION
+ 15, // STREAM_BLUETOOTH_SCO
7, // STREAM_SYSTEM_ENFORCED
- 5, // STREAM_DTMF
- 5, // STREAM_TTS
- 5, // STREAM_ACCESSIBILITY
+ 15, // STREAM_DTMF
+ 15, // STREAM_TTS
+ 15, // STREAM_ACCESSIBILITY
};
public static String streamToString(int stream) {
diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java
index 6f2b214eb58..27bec9fdf84 100644
--- a/services/core/java/com/android/server/audio/AudioService.java
+++ b/services/core/java/com/android/server/audio/AudioService.java
@@ -781,6 +781,26 @@ public class AudioService extends IAudioService.Stub
// Default is to use maximum.
AudioSystem.DEFAULT_STREAM_VOLUME[AudioSystem.STREAM_SYSTEM] =
MAX_STREAM_VOLUME[AudioSystem.STREAM_SYSTEM];
+ AudioSystem.DEFAULT_STREAM_VOLUME[AudioSystem.STREAM_RING] =
+ MAX_STREAM_VOLUME[AudioSystem.STREAM_RING];
+ AudioSystem.DEFAULT_STREAM_VOLUME[AudioSystem.STREAM_MUSIC] =
+ MAX_STREAM_VOLUME[AudioSystem.STREAM_MUSIC];
+ AudioSystem.DEFAULT_STREAM_VOLUME[AudioSystem.STREAM_ALARM] =
+ MAX_STREAM_VOLUME[AudioSystem.STREAM_ALARM];
+ AudioSystem.DEFAULT_STREAM_VOLUME[AudioSystem.STREAM_BLUETOOTH_SCO] =
+ MAX_STREAM_VOLUME[AudioSystem.STREAM_BLUETOOTH_SCO];
+ AudioSystem.DEFAULT_STREAM_VOLUME[AudioSystem.STREAM_DTMF] =
+ MAX_STREAM_VOLUME[AudioSystem.STREAM_DTMF];
+ AudioSystem.DEFAULT_STREAM_VOLUME[AudioSystem.STREAM_TTS] =
+ MAX_STREAM_VOLUME[AudioSystem.STREAM_TTS];
+ AudioSystem.DEFAULT_STREAM_VOLUME[AudioSystem.STREAM_ACCESSIBILITY] =
+ MAX_STREAM_VOLUME[AudioSystem.STREAM_ACCESSIBILITY];
+ AudioSystem.DEFAULT_STREAM_VOLUME[AudioSystem.STREAM_VOICE_CALL] =
+ MAX_STREAM_VOLUME[AudioSystem.STREAM_VOICE_CALL];
+ AudioSystem.DEFAULT_STREAM_VOLUME[AudioSystem.STREAM_NOTIFICATION] =
+ MAX_STREAM_VOLUME[AudioSystem.STREAM_NOTIFICATION];
+ AudioSystem.DEFAULT_STREAM_VOLUME[AudioSystem.STREAM_SYSTEM_ENFORCED] =
+ MAX_STREAM_VOLUME[AudioSystem.STREAM_SYSTEM_ENFORCED];
}
sSoundEffectVolumeDb = context.getResources().getInteger(
