commit 2c148c58a632a7f4828e4bbdc547b593b746f937
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Thu Sep 06 00:34:33 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Sep 06 00:34:33 2018 +0000
tree f4e92e2b2a896d875719baa75d24251d46653d1e
parent 8aac09b0c6765eabd95c1afaaeed25ef4f0fd4ae
parent dda83671f3dad949f3e32c3a833679fd4f72caa4

Merge "[automerger skipped] [automerger] RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions. am: 8da6786608 am: 7d153c56c6 am: eff2a46342 am: ee4a2aee83 skipped: 879ecd17ab am: 47a4d99c0c am: 15682d0bd4 am: 4c0878bf74  -s ours am: 02fff3e2eb" into pi-dev-plus-aosp

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