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

Merge "Adjust the APC active state"

Browse Source
This commit is contained in:
Vlad Popa
2022-11-01 15:37:17 +00:00
committed by Android (Google) Code Review
parent 07d58c6de3 3ddad6750e
commit c4c34ec353
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -569,6 +569,17 @@ public final class AudioPlaybackConfiguration implements Parcelable {
}
}
private boolean isMuteAffectingActiveState() {
if (mMutedState == PLAYER_MUTE_INVALID) {
// mute state is not set, therefore it will not affect the active state
return false;
}
return (mMutedState & PLAYER_MUTE_CLIENT_VOLUME) != 0
|| (mMutedState & PLAYER_MUTE_VOLUME_SHAPER) != 0
|| (mMutedState & PLAYER_MUTE_PLAYBACK_RESTRICTED) != 0;
}
/**
* @hide
* Returns true if the player is considered "active", i.e. actively playing with unmuted
@@ -580,8 +591,7 @@ public final class AudioPlaybackConfiguration implements Parcelable {
public boolean isActive() {
switch (mPlayerState) {
case PLAYER_STATE_STARTED:
return mMutedState == 0
|| mMutedState == PLAYER_MUTE_INVALID; // only send true if not muted
return !isMuteAffectingActiveState();
case PLAYER_STATE_UNKNOWN:
case PLAYER_STATE_RELEASED:
case PLAYER_STATE_IDLE: