summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Oscar Azucena <oscarazu@google.com> 2022-01-28 21:42:15 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-01-28 21:42:15 +0000
commit2b18dee114a0ff85e7b7051b5232ae030690c545 (patch)
tree922f86c28cd8168d00665e23b0ad824c3f6e1be1
parent138c4fe4bc98abc8f7817b92353ef8a101b35db7 (diff)
parent9af845a47ec34b935f3d23b334b247c4523cfee3 (diff)
Merge "Fixed silent mode alarm play at full volume" into sc-v2-dev am: 9af845a47e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16668523 Change-Id: Ib4d4d6731f2ed1fe63147cc7e1d26f0c1e349a87
-rw-r--r--services/core/java/com/android/server/audio/PlaybackActivityMonitor.java3
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 55d0728d803e..47c73822ed46 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)