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

Commit ee7f4707 authored by Vlad Popa's avatar Vlad Popa Committed by Android (Google) Code Review
Browse files

Merge "Handle the volume shapre mute events"

parents f4863751 e35399de

media/java/android/media/AudioPlaybackConfiguration.java

+9 −2
Original line number Diff line number Diff line
@@ -248,12 +248,18 @@ public final class AudioPlaybackConfiguration implements Parcelable { 
     * Flag used when muted by client volume.

     */

    public static final int PLAYER_MUTE_CLIENT_VOLUME = (1 << 4);

    /**

     * @hide

     * Flag used when muted by volume shaper.

     */

    public static final int PLAYER_MUTE_VOLUME_SHAPER = (1 << 5);



    /** @hide */

    @IntDef(

            flag = true,

            value = {PLAYER_MUTE_MASTER, PLAYER_MUTE_STREAM_VOLUME, PLAYER_MUTE_STREAM_MUTED,

                    PLAYER_MUTE_PLAYBACK_RESTRICTED, PLAYER_MUTE_CLIENT_VOLUME})

                    PLAYER_MUTE_PLAYBACK_RESTRICTED, PLAYER_MUTE_CLIENT_VOLUME,

                    PLAYER_MUTE_VOLUME_SHAPER})

    @Retention(RetentionPolicy.SOURCE)

    public @interface PlayerMuteEvent {

    }
@@ -684,7 +690,8 @@ public final class AudioPlaybackConfiguration implements Parcelable { 
                + " muteFromStreamMuted=" + ((mMutedState & PLAYER_MUTE_STREAM_MUTED) != 0)

                + " muteFromPlaybackRestricted=" + ((mMutedState & PLAYER_MUTE_PLAYBACK_RESTRICTED)

                != 0)

                + " muteFromClientVolume=" + ((mMutedState & PLAYER_MUTE_CLIENT_VOLUME) != 0);

                + " muteFromClientVolume=" + ((mMutedState & PLAYER_MUTE_CLIENT_VOLUME) != 0)

                + " muteFromVolumeShaper=" + ((mMutedState & PLAYER_MUTE_VOLUME_SHAPER) != 0);

    }



    //=====================================================================

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

+3 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import static android.media.AudioPlaybackConfiguration.PLAYER_MUTE_MASTER; 
import static android.media.AudioPlaybackConfiguration.PLAYER_MUTE_PLAYBACK_RESTRICTED;

import static android.media.AudioPlaybackConfiguration.PLAYER_MUTE_STREAM_MUTED;

import static android.media.AudioPlaybackConfiguration.PLAYER_MUTE_STREAM_VOLUME;

import static android.media.AudioPlaybackConfiguration.PLAYER_MUTE_VOLUME_SHAPER;

import static android.media.AudioPlaybackConfiguration.PLAYER_PIID_INVALID;

import static android.media.AudioPlaybackConfiguration.PLAYER_UPDATE_MUTED;
@@ -1148,6 +1149,8 @@ public final class PlaybackActivityMonitor 
                            (mEventValue & PLAYER_MUTE_PLAYBACK_RESTRICTED) != 0);

                    builder.append(" muteFromClientVolume:").append(

                            (mEventValue & PLAYER_MUTE_CLIENT_VOLUME) != 0);

                    builder.append(" muteFromVolumeShaper:").append(

                            (mEventValue & PLAYER_MUTE_VOLUME_SHAPER) != 0);

                    return builder.toString();

                default:

                    return builder.toString();