commit 8aac09b0c6765eabd95c1afaaeed25ef4f0fd4ae
author Par-Gunnar Hjalmdahl <pargunnar.hjalmdahl@sonymobile.com> Wed Sep 05 17:31:28 2018 -0700
committer android-build-merger <android-build-merger@google.com> Wed Sep 05 17:31:28 2018 -0700
tree f4e92e2b2a896d875719baa75d24251d46653d1e
parent 6d45f85db513cbba993cc36ad6c7a0fd47df38d9
parent ce31fe2fb8727d3624daca7a4018546ea4328191

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

Change-Id: I0901d4076b693d43796fa5552dc0ee5ac383b70e

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;
         }