diff options
| -rw-r--r-- | media/java/android/media/AudioManager.java | 11 | ||||
| -rw-r--r-- | services/core/java/com/android/server/audio/AudioService.java | 2 |
2 files changed, 13 insertions, 0 deletions
diff --git a/media/java/android/media/AudioManager.java b/media/java/android/media/AudioManager.java index b3b2b973bc37..2c28d8ec2fbb 100644 --- a/media/java/android/media/AudioManager.java +++ b/media/java/android/media/AudioManager.java @@ -204,6 +204,17 @@ public class AudioManager { public static final String EXTRA_VOLUME_STREAM_TYPE = "android.media.EXTRA_VOLUME_STREAM_TYPE"; /** + * @hide + * The stream type alias for the volume changed intent. + * For instance the intent may indicate a change of the {@link #STREAM_NOTIFICATION} stream + * type (as indicated by the {@link #EXTRA_VOLUME_STREAM_TYPE} extra), but this is also + * reflected by a change of the volume of its alias, {@link #STREAM_RING} on some devices, + * {@link #STREAM_MUSIC} on others (e.g. a television). + */ + public static final String EXTRA_VOLUME_STREAM_TYPE_ALIAS = + "android.media.EXTRA_VOLUME_STREAM_TYPE_ALIAS"; + + /** * @hide The volume associated with the stream for the volume changed intent. */ public static final String EXTRA_VOLUME_STREAM_VALUE = diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java index 0dc4076b067d..dd4111d593dc 100644 --- a/services/core/java/com/android/server/audio/AudioService.java +++ b/services/core/java/com/android/server/audio/AudioService.java @@ -3791,6 +3791,8 @@ public class AudioService extends IAudioService.Stub { // fire changed intents for all streams mVolumeChanged.putExtra(AudioManager.EXTRA_VOLUME_STREAM_VALUE, index); mVolumeChanged.putExtra(AudioManager.EXTRA_PREV_VOLUME_STREAM_VALUE, oldIndex); + mVolumeChanged.putExtra(AudioManager.EXTRA_VOLUME_STREAM_TYPE_ALIAS, + mStreamVolumeAlias[mStreamType]); sendBroadcastToAll(mVolumeChanged); } return changed; |