summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2018-09-05 22:43:07 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2018-09-05 22:43:07 +0000
commit024387744a544bb7c4fc14c60b53969cf2ca449f (patch)
tree922424f6e7404902cfd742fcc0a75151a7ba7835
parentef98a2ca1ca8fc1cf0dd2f8a7d098f4c00917be4 (diff)
parent96e68bc2e60fa4ae8cb52aaa520148c8ea1fb737 (diff)
Merge "Convert AudioAttribute to Stream correctly"
-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;
}