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

Commit e71ab3be authored by Eric Laurent's avatar Eric Laurent Committed by Android Git Automerger
Browse files

am 648e593b: am 02d9054a: am db1c0e19: Merge "fix condition to send... 

am 648e593b: am 02d9054a: am db1c0e19: Merge "fix condition to send ACTION_AUDIO_BECOMING_NOISY intent" into lmp-dev

* commit '648e593be4855b7303b26532b5680ef02afb02f8':
  fix condition to send ACTION_AUDIO_BECOMING_NOISY intent
parents db72969e 8fd0f8f0

media/java/android/media/AudioService.java

+2 −1
Original line number Diff line number Diff line
@@ -4290,7 +4290,8 @@ public class AudioService extends IAudioService.Stub { 
        if ((state == 0) && ((device & mBecomingNoisyIntentDevices) != 0)) {

            int devices = 0;

            for (int dev : mConnectedDevices.keySet()) {

                if ((dev & mBecomingNoisyIntentDevices) != 0) {

                if (((dev & AudioSystem.DEVICE_BIT_IN) == 0) &&

                        ((dev & mBecomingNoisyIntentDevices) != 0)) {

                   devices |= dev;

                }

            }