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

Commit 458afa08 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[audio] Deprecate/rename mute event for clarity" into main

parents 09e4858b af18332c

core/api/system-current.txt

+2 −1
Original line number Diff line number Diff line
@@ -7637,10 +7637,11 @@ package android.media { 
    method public boolean isActive();

    method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public boolean isMuted();

    method public boolean isSpatialized();

    field @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public static final int MUTED_BY_APP_OPS = 8; // 0x8

    field @Deprecated @FlaggedApi("android.media.audio.muted_by_port_volume_api") @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public static final int MUTED_BY_APP_OPS = 8; // 0x8

    field @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public static final int MUTED_BY_CLIENT_VOLUME = 16; // 0x10

    field @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public static final int MUTED_BY_MASTER = 1; // 0x1

    field @FlaggedApi("android.media.audio.muted_by_port_volume_api") @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public static final int MUTED_BY_OP_CONTROL_AUDIO = 128; // 0x80

    field @FlaggedApi("android.media.audio.muted_by_port_volume_api") @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public static final int MUTED_BY_OP_PLAY_AUDIO = 8; // 0x8

    field @FlaggedApi("android.media.audio.muted_by_port_volume_api") @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public static final int MUTED_BY_PORT_VOLUME = 64; // 0x40

    field @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public static final int MUTED_BY_STREAM_MUTED = 4; // 0x4

    field @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public static final int MUTED_BY_STREAM_VOLUME = 2; // 0x2

media/java/android/media/AudioPlaybackConfiguration.java

+16 −5
Original line number Diff line number Diff line
@@ -283,8 +283,19 @@ public final class AudioPlaybackConfiguration implements Parcelable { 
     * Flag used when playback is muted by AppOpsManager#OP_PLAY_AUDIO.

     */

    @SystemApi

    @FlaggedApi(FLAG_MUTED_BY_PORT_VOLUME_API)

    @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING)

    public static final int MUTED_BY_OP_PLAY_AUDIO = (1 << 3);

    /**

     * @hide

     * Flag used when playback is muted by AppOpsManager#OP_PLAY_AUDIO.

     * @deprecated see {@link MUTED_BY_OP_PLAY_AUDIO}

     */

    @SystemApi

    @Deprecated

    @FlaggedApi(FLAG_MUTED_BY_PORT_VOLUME_API)

    @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING)

    public static final int MUTED_BY_APP_OPS = (1 << 3);

    public static final int MUTED_BY_APP_OPS = MUTED_BY_OP_PLAY_AUDIO;

    /**

     * @hide

     * Flag used when muted by client volume.
@@ -324,7 +335,7 @@ public final class AudioPlaybackConfiguration implements Parcelable { 
    @IntDef(

            flag = true,

            value = {MUTED_BY_MASTER, MUTED_BY_STREAM_VOLUME, MUTED_BY_STREAM_MUTED,

                    MUTED_BY_APP_OPS, MUTED_BY_CLIENT_VOLUME, MUTED_BY_VOLUME_SHAPER,

                    MUTED_BY_OP_PLAY_AUDIO, MUTED_BY_CLIENT_VOLUME, MUTED_BY_VOLUME_SHAPER,

                    MUTED_BY_PORT_VOLUME, MUTED_BY_OP_CONTROL_AUDIO})

    @Retention(RetentionPolicy.SOURCE)

    public @interface PlayerMuteEvent {
@@ -770,7 +781,7 @@ public final class AudioPlaybackConfiguration implements Parcelable { 
    private boolean isMuteAffectingActiveState() {

        return (mMutedState & MUTED_BY_CLIENT_VOLUME) != 0

                || (mMutedState & MUTED_BY_VOLUME_SHAPER) != 0

                || (mMutedState & MUTED_BY_APP_OPS) != 0;

                || (mMutedState & MUTED_BY_OP_PLAY_AUDIO) != 0;

    }



    /**
@@ -911,8 +922,8 @@ public final class AudioPlaybackConfiguration implements Parcelable { 
                if ((mMutedState & MUTED_BY_STREAM_MUTED) != 0) {

                    apcToString.append("streamMute ");

                }

                if ((mMutedState & MUTED_BY_APP_OPS) != 0) {

                    apcToString.append("appOps ");

                if ((mMutedState & MUTED_BY_OP_PLAY_AUDIO) != 0) {

                    apcToString.append("opPlayAudio ");

                }

                if ((mMutedState & MUTED_BY_CLIENT_VOLUME) != 0) {

                    apcToString.append("clientVolume ");

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

+3 −3
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
package com.android.server.audio;



import static android.media.AudioPlaybackConfiguration.EXTRA_PLAYER_EVENT_MUTE;

import static android.media.AudioPlaybackConfiguration.MUTED_BY_APP_OPS;

import static android.media.AudioPlaybackConfiguration.MUTED_BY_OP_PLAY_AUDIO;

import static android.media.AudioPlaybackConfiguration.MUTED_BY_CLIENT_VOLUME;

import static android.media.AudioPlaybackConfiguration.MUTED_BY_MASTER;

import static android.media.AudioPlaybackConfiguration.MUTED_BY_PORT_VOLUME;
@@ -1377,8 +1377,8 @@ public final class PlaybackActivityMonitor 
                        if ((eventValue & MUTED_BY_STREAM_MUTED) != 0) {

                            builder.append("streamMute ");

                        }

                        if ((eventValue & MUTED_BY_APP_OPS) != 0) {

                            builder.append("appOps ");

                        if ((eventValue & MUTED_BY_OP_PLAY_AUDIO) != 0) {

                            builder.append("opPlayAudio ");

                        }

                        if ((eventValue & MUTED_BY_CLIENT_VOLUME) != 0) {

                            builder.append("clientVolume ");