Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3a0d77f4 authored by Jean-Michel Trivi's avatar Jean-Michel Trivi Committed by Android (Google) Code Review
Browse files

Merge "Volume change intent carries stream alias" into mnc-dev

parents 4daf600e 560877d4

media/java/android/media/AudioManager.java

+11 −0
Original line number Diff line number Diff line
@@ -203,6 +203,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.

     */

services/core/java/com/android/server/audio/AudioService.java

+2 −0
Original line number Diff line number Diff line
@@ -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;