Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6df8e024 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "audio: add USAGE_UNKNOWN to mediaActive condition" into main am: 02639b86 am: e67781db 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3081324



Change-Id: I82a4c59410557675c34ffd2c2e8bd8955f564519
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8fee510d e67781db

services/core/java/com/android/server/audio/AudioService.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -4440,7 +4440,8 @@ public class AudioService extends IAudioService.Stub 
                    || usage == AudioAttributes.USAGE_VOICE_COMMUNICATION_SIGNALLING) {

                    || usage == AudioAttributes.USAGE_VOICE_COMMUNICATION_SIGNALLING) {

                voiceActive = true;

                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;

                mediaActive = true;

            }

            }

        }

        }