commit ce31fe2fb8727d3624daca7a4018546ea4328191
author Par-Gunnar Hjalmdahl <pargunnar.hjalmdahl@sonymobile.com> Wed Sep 05 16:21:58 2018 -0700
committer android-build-merger <android-build-merger@google.com> Wed Sep 05 16:21:58 2018 -0700
tree 88a5e2b8a11c362540b70ecbeb38d8da1f19209b
parent 376701415de8bbc52ec84f1807a519369a23025a
parent 024387744a544bb7c4fc14c60b53969cf2ca449f

Merge "Convert AudioAttribute to Stream correctly"
am: 024387744a

Change-Id: If8b0bd7b8fa83bddd29b0c15aef0f3a719b7be5f

media/java/android/media/AudioAttributes.java

diff --git a/media/java/android/media/AudioAttributes.java b/media/java/android/media/AudioAttributes.java
index e8bc622..0476222 100644
--- a/media/java/android/media/AudioAttributes.java
+++ b/media/java/android/media/AudioAttributes.java
@@ -1035,7 +1035,7 @@
             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;
         }