summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2024-05-14 15:54:52 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-05-14 15:54:52 +0000
commit6df8e02437e34fe6441312ac8a176c8a796df1db (patch)
tree70e40a2a9d4f6c799e6513d945218d2408901a5b
parent8fee510d76f5ffcfa6114866fdb63aa4055f4e3a (diff)
parente67781db67b15924ca7b094765aba94f9824ab16 (diff)
Merge "audio: add USAGE_UNKNOWN to mediaActive condition" into main am: 02639b8643 am: e67781db67
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3081324 Change-Id: I82a4c59410557675c34ffd2c2e8bd8955f564519 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--services/core/java/com/android/server/audio/AudioService.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java
index c3108229c265..15c5c1077803 100644
--- a/services/core/java/com/android/server/audio/AudioService.java
+++ b/services/core/java/com/android/server/audio/AudioService.java
@@ -4440,7 +4440,8 @@ public class AudioService extends IAudioService.Stub
|| usage == AudioAttributes.USAGE_VOICE_COMMUNICATION_SIGNALLING) {
voiceActive = true;
}
- if (usage == AudioAttributes.USAGE_MEDIA || usage == AudioAttributes.USAGE_GAME) {
+ if (usage == AudioAttributes.USAGE_MEDIA || usage == AudioAttributes.USAGE_GAME
+ || usage == AudioAttributes.USAGE_UNKNOWN) {
mediaActive = true;
}
}