From e35399de9ee8bdc0f49a6882ee13e60dbe6d85b6 Mon Sep 17 00:00:00 2001 From: Vlad Popa Date: Tue, 2 Aug 2022 15:43:05 +0200 Subject: [PATCH] Handle the volume shapre mute events Logging the shapre volume mute events in audio dumpsys Test: dumpsys audio Bug: 235521198 Change-Id: I203405a51e2bf7ed6a313ec3ea8aa89467066e9b --- .../android/media/AudioPlaybackConfiguration.java | 11 +++++++++-- .../android/server/audio/PlaybackActivityMonitor.java | 3 +++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/media/java/android/media/AudioPlaybackConfiguration.java b/media/java/android/media/AudioPlaybackConfiguration.java index 9a3d3699aae5d..60c812ad048fa 100644 --- a/media/java/android/media/AudioPlaybackConfiguration.java +++ b/media/java/android/media/AudioPlaybackConfiguration.java @@ -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); } //===================================================================== diff --git a/services/core/java/com/android/server/audio/PlaybackActivityMonitor.java b/services/core/java/com/android/server/audio/PlaybackActivityMonitor.java index f3ddd21b8538f..4559c56b6de0f 100644 --- a/services/core/java/com/android/server/audio/PlaybackActivityMonitor.java +++ b/services/core/java/com/android/server/audio/PlaybackActivityMonitor.java @@ -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();