summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Par-Gunnar Hjalmdahl <pargunnar.hjalmdahl@sonymobile.com> 2015-05-28 10:02:43 +0200
committer Tomoharu Kasahara <tomoharu.kasahara@sony.com> 2018-08-28 20:34:01 +0900
commit96e68bc2e60fa4ae8cb52aaa520148c8ea1fb737 (patch)
tree31f86ada1bb9c05dfee04d2ba4e555a227e9a9a3
parent473654c377279c16a42661d95ad1fbe80322d918 (diff)
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
-rw-r--r--media/java/android/media/AudioAttributes.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/java/android/media/AudioAttributes.java b/media/java/android/media/AudioAttributes.java
index e8bc62298c47..047622222065 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;
}