diff options
| author | 2022-01-15 00:09:25 +0000 | |
|---|---|---|
| committer | 2022-01-15 00:09:25 +0000 | |
| commit | 1ac97f415bd7d74a8150e4ac667f7c9a3213ab5c (patch) | |
| tree | 9cd1e6b5e8eab8cab5040aa52e98b1b6ad09e6dc | |
| parent | 5f5924cb60553a8dac0d28aa8daa777ec72b555d (diff) | |
| parent | de364ea6476c060a6449b842ef306c328d38929e (diff) | |
Merge "Fixed silent mode alarm play at full volume"
| -rw-r--r-- | services/core/java/com/android/server/audio/PlaybackActivityMonitor.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/audio/PlaybackActivityMonitor.java b/services/core/java/com/android/server/audio/PlaybackActivityMonitor.java index 406b2dd2486d..74c899980d86 100644 --- a/services/core/java/com/android/server/audio/PlaybackActivityMonitor.java +++ b/services/core/java/com/android/server/audio/PlaybackActivityMonitor.java @@ -252,6 +252,9 @@ public final class PlaybackActivityMonitor AudioAttributes.FLAG_BYPASS_MUTE; private void checkVolumeForPrivilegedAlarm(AudioPlaybackConfiguration apc, int event) { + if (event == AudioPlaybackConfiguration.PLAYER_UPDATE_DEVICE_ID) { + return; + } if (event == AudioPlaybackConfiguration.PLAYER_STATE_STARTED || apc.getPlayerState() == AudioPlaybackConfiguration.PLAYER_STATE_STARTED) { if ((apc.getAudioAttributes().getAllFlags() & FLAGS_FOR_SILENCE_OVERRIDE) |