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

Commit 3fbbf6eb authored by Jean-Michel Trivi's avatar Jean-Michel Trivi
Browse files

Audio service: restrict conditions to send ACTION_AUDIO_BECOMING_NOISY 

Do not send ACTION_AUDIO_BECOMING_NOISY if:
- DEVICE_OUT_REMOTE_SUBMIX is in the selected devices for media streams
- there is no media playback at the time

Bug: 112203196
Test: see repro steps in bug
Change-Id: I9cc8347837de2eb3c9949f81c11bdfb352512804
parent 63903392

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

+12 −3
Original line number Diff line number Diff line
@@ -854,11 +854,20 @@ public final class AudioDeviceInventory { 
        if (musicDevice == AudioSystem.DEVICE_NONE) {

            musicDevice = mDeviceBroker.getDeviceForStream(AudioSystem.STREAM_MUSIC);

        }

        // ignore condition on device being actually used for music when in communication



        // always ignore condition on device being actually used for music when in communication

        // because music routing is altered in this case.

        // also checks whether media routing if affected by a dynamic policy

        // also checks whether media routing if affected by a dynamic policy or mirroring

        if (((device == musicDevice) || mDeviceBroker.isInCommunication())

                && (device == devices) && !mDeviceBroker.hasMediaDynamicPolicy()) {

                && (device == devices) && !mDeviceBroker.hasMediaDynamicPolicy()

                        && ((musicDevice & AudioSystem.DEVICE_OUT_REMOTE_SUBMIX) == 0)) {

            if (!AudioSystem.isStreamActive(AudioSystem.STREAM_MUSIC, 0 /*not looking in past*/)) {

                // no media playback, not a "becoming noisy" situation, otherwise it could cause

                // the pausing of some apps that are playing remotely

                AudioService.sDeviceLogger.log((new AudioEventLogger.StringEvent(

                        "dropping ACTION_AUDIO_BECOMING_NOISY, no media playback")).printLog(TAG));

                return 0;

            }

            mDeviceBroker.postBroadcastBecomingNoisy();

            delay = 1000;

        }