Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7e02c288 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "[automerger skipped] Merge "Add process-lifecycle-owner-initializer to... 

Merge "[automerger skipped] Merge "Add process-lifecycle-owner-initializer to tests." am: 460a5294  -s ours" into stage-aosp-master
parents ce31fe2f e06362bb

media/java/android/media/AudioAttributes.java

+1 −1
Original line number Diff line number Diff line
@@ -1035,7 +1035,7 @@ public final class AudioAttributes implements Parcelable { 
            return fromGetVolumeControlStream ?

                    AudioSystem.STREAM_SYSTEM : AudioSystem.STREAM_SYSTEM_ENFORCED;

        }

        if ((aa.getAllFlags() & FLAG_SCO) == FLAG_SCO) {

        if ((aa.getFlags() & FLAG_SCO) == FLAG_SCO) {

            return fromGetVolumeControlStream ?

                    AudioSystem.STREAM_VOICE_CALL : AudioSystem.STREAM_BLUETOOTH_SCO;

        }