From 27c30e4426302581a266c89d0ef880b340d7b061 Mon Sep 17 00:00:00 2001 From: Eric Laurent Date: Wed, 27 Aug 2014 12:36:33 -0700 Subject: [PATCH] fix condition to send ACTION_AUDIO_BECOMING_NOISY intent In checkSendBecomingNoisyIntent(), only output devices must be taken into account when checking if the device type is in mBecomingNoisyIntentDevices Bug: 17298383. Bug: 16403219. Change-Id: I2213681184ab9fb3b874029143f2bbd34032d6b8 --- media/java/android/media/AudioService.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/media/java/android/media/AudioService.java b/media/java/android/media/AudioService.java index dae539bd647b2..bce40745658d6 100644 --- a/media/java/android/media/AudioService.java +++ b/media/java/android/media/AudioService.java @@ -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; } }