From 96e68bc2e60fa4ae8cb52aaa520148c8ea1fb737 Mon Sep 17 00:00:00 2001 From: Par-Gunnar Hjalmdahl Date: Thu, 28 May 2015 10:02:43 +0200 Subject: [PATCH] Convert AudioAttribute to Stream correctly When converting an AudioAttribute with FLAG_SCO set, it should be converted to STREAM_BLUETOOTH_SCO. However, since getFlags() returns only public flags, and FLAG_SCO isn't public, the conversion will fail. Change to getAllFlags() to get right flags. Bug: 113314374 Test: Use AudioAttributes.toLegacyStreamType Change-Id: Ic283f055d746d5c3df645dc310c92dac3c80827f --- media/java/android/media/AudioAttributes.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media/java/android/media/AudioAttributes.java b/media/java/android/media/AudioAttributes.java index e8bc62298c478..047622222065e 100644 --- a/media/java/android/media/AudioAttributes.java +++ b/media/java/android/media/AudioAttributes.java @@ -1035,7 +1035,7 @@ public final class AudioAttributes implements Parcelable { return fromGetVolumeControlStream ? AudioSystem.STREAM_SYSTEM : AudioSystem.STREAM_SYSTEM_ENFORCED; } - if ((aa.getFlags() & FLAG_SCO) == FLAG_SCO) { + if ((aa.getAllFlags() & FLAG_SCO) == FLAG_SCO) { return fromGetVolumeControlStream ? AudioSystem.STREAM_VOICE_CALL : AudioSystem.STREAM_BLUETOOTH_SCO; }