Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '648e593be4855b7303b26532b5680ef02afb02f8':
  fix condition to send ACTION_AUDIO_BECOMING_NOISY intent
This commit is contained in:
Eric Laurent
2014-08-27 22:25:00 +00:00
committed by Android Git Automerger
parent db72969e93 8fd0f8f01d
commit e71ab3bef9
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
media/java/android/media/AudioService.java
View File

@@ -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;
}
}