summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Par-Gunnar Hjalmdahl <pargunnar.hjalmdahl@sonymobile.com> 2018-09-05 16:21:58 -0700
committer android-build-merger <android-build-merger@google.com> 2018-09-05 16:21:58 -0700
commitce31fe2fb8727d3624daca7a4018546ea4328191 (patch)
tree88a5e2b8a11c362540b70ecbeb38d8da1f19209b
parent376701415de8bbc52ec84f1807a519369a23025a (diff)
parent024387744a544bb7c4fc14c60b53969cf2ca449f (diff)
Merge "Convert AudioAttribute to Stream correctly"
am: 024387744a Change-Id: If8b0bd7b8fa83bddd29b0c15aef0f3a719b7be5f
-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;
}