Merge "Fixed silent mode alarm play at full volume" into sc-v2-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
9af845a47e
@@ -225,6 +225,9 @@ public final class PlaybackActivityMonitor
|
|||||||
AudioAttributes.FLAG_BYPASS_MUTE;
|
AudioAttributes.FLAG_BYPASS_MUTE;
|
||||||
|
|
||||||
private void checkVolumeForPrivilegedAlarm(AudioPlaybackConfiguration apc, int event) {
|
private void checkVolumeForPrivilegedAlarm(AudioPlaybackConfiguration apc, int event) {
|
||||||
|
if (event == AudioPlaybackConfiguration.PLAYER_UPDATE_DEVICE_ID) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
if (event == AudioPlaybackConfiguration.PLAYER_STATE_STARTED ||
|
if (event == AudioPlaybackConfiguration.PLAYER_STATE_STARTED ||
|
||||||
apc.getPlayerState() == AudioPlaybackConfiguration.PLAYER_STATE_STARTED) {
|
apc.getPlayerState() == AudioPlaybackConfiguration.PLAYER_STATE_STARTED) {
|
||||||
if ((apc.getAudioAttributes().getAllFlags() & FLAGS_FOR_SILENCE_OVERRIDE)
|
if ((apc.getAudioAttributes().getAllFlags() & FLAGS_FOR_SILENCE_OVERRIDE)
|
||||||
|
|||||||
Reference in New Issue
Block a user