diff options
| author | 2022-01-28 21:27:22 +0000 | |
|---|---|---|
| committer | 2022-01-28 21:27:22 +0000 | |
| commit | 9af845a47ec34b935f3d23b334b247c4523cfee3 (patch) | |
| tree | 58d550771f4866837a2e07e2a6e2de53df8f3567 | |
| parent | 7f62909c98138a4090f25b67db03ab3a1af05741 (diff) | |
| parent | dc38701d384887ef00167a3aedacd6aeb74b44b5 (diff) | |
Merge "Fixed silent mode alarm play at full volume" into sc-v2-dev
| -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 b94cea4d5d40..40c8f1940bda 100644 --- a/services/core/java/com/android/server/audio/PlaybackActivityMonitor.java +++ b/services/core/java/com/android/server/audio/PlaybackActivityMonitor.java @@ -225,6 +225,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) |