diff options
| -rw-r--r-- | media/java/android/media/AudioPlaybackConfiguration.java | 11 | ||||
| -rw-r--r-- | services/core/java/com/android/server/audio/PlaybackActivityMonitor.java | 5 |
2 files changed, 15 insertions, 1 deletions
diff --git a/media/java/android/media/AudioPlaybackConfiguration.java b/media/java/android/media/AudioPlaybackConfiguration.java index c085b8985783..62fb0120a97d 100644 --- a/media/java/android/media/AudioPlaybackConfiguration.java +++ b/media/java/android/media/AudioPlaybackConfiguration.java @@ -311,12 +311,18 @@ public final class AudioPlaybackConfiguration implements Parcelable { @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public static final int MUTED_BY_PORT_VOLUME = (1 << 6); + /** + * @hide + * Flag used when playback is muted by AppOpsManager#OP_CONTROL_AUDIO. + */ + public static final int MUTED_BY_OP_CONTROL_AUDIO = (1 << 7); + /** @hide */ @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_PORT_VOLUME}) + MUTED_BY_PORT_VOLUME, MUTED_BY_OP_CONTROL_AUDIO}) @Retention(RetentionPolicy.SOURCE) public @interface PlayerMuteEvent { } @@ -914,6 +920,9 @@ public final class AudioPlaybackConfiguration implements Parcelable { if ((mMutedState & MUTED_BY_PORT_VOLUME) != 0) { apcToString.append("portVolume "); } + if ((mMutedState & MUTED_BY_OP_CONTROL_AUDIO) != 0) { + apcToString.append("opControlAudio "); + } } apcToString.append(" ").append(mFormatInfo); } diff --git a/services/core/java/com/android/server/audio/PlaybackActivityMonitor.java b/services/core/java/com/android/server/audio/PlaybackActivityMonitor.java index a62ac82f27eb..a2200c9f8bf5 100644 --- a/services/core/java/com/android/server/audio/PlaybackActivityMonitor.java +++ b/services/core/java/com/android/server/audio/PlaybackActivityMonitor.java @@ -24,6 +24,7 @@ import static android.media.AudioPlaybackConfiguration.MUTED_BY_PORT_VOLUME; import static android.media.AudioPlaybackConfiguration.MUTED_BY_STREAM_MUTED; import static android.media.AudioPlaybackConfiguration.MUTED_BY_STREAM_VOLUME; import static android.media.AudioPlaybackConfiguration.MUTED_BY_VOLUME_SHAPER; +import static android.media.AudioPlaybackConfiguration.MUTED_BY_OP_CONTROL_AUDIO; import static android.media.AudioPlaybackConfiguration.PLAYER_PIID_INVALID; import static android.media.AudioPlaybackConfiguration.PLAYER_UPDATE_MUTED; @@ -1388,6 +1389,10 @@ public final class PlaybackActivityMonitor if ((eventValue & MUTED_BY_PORT_VOLUME) != 0) { builder.append("portVolume "); } + if ((eventValue & MUTED_BY_OP_CONTROL_AUDIO) != 0) { + builder.append("opControlAudio "); + } + } return builder.toString(); default: |