summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2024-05-14 15:12:56 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2024-05-14 15:12:56 +0000
commit02639b8643cfcdcddef2d5fcb74e042174f06c1f (patch)
tree22e8c55e5ffea77abef5e3855fe806cf618e24b7
parent91ed58744f3d2e5fbbc265a59df3491a44955acb (diff)
parent1bd69280c128ee35b2351452f55fd48e401eb9fe (diff)
Merge "audio: add USAGE_UNKNOWN to mediaActive condition" into main
-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 49fa39de943e..69c6752fce1f 100644
--- a/services/core/java/com/android/server/audio/AudioService.java
+++ b/services/core/java/com/android/server/audio/AudioService.java
@@ -4408,7 +4408,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;
}
}