Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Handle the volume shapre mute events"

Browse Source
This commit is contained in:
Vlad Popa
2022-08-09 08:15:21 +00:00
committed by Android (Google) Code Review
parent f4863751e5 e35399de9e
commit ee7f47079e
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
media/java/android/media/AudioPlaybackConfiguration.java
View File

@@ -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);
}
//=====================================================================

3
services/core/java/com/android/server/audio/PlaybackActivityMonitor.java
View File

@@ -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();