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

Commit 2054ade6 authored by Jean-Michel Trivi's avatar Jean-Michel Trivi Committed by Automerger Merge Worker
Browse files

Merge "AudioAttributes: fix setter for flags" into rvc-dev am: a750903b am: 78d37b71 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12003758

Change-Id: I04eb33330a4e5277b164adc2604d52993c780750
parents 7dc169cf 78d37b71

media/java/android/media/AudioAttributes.java

+5 −1
Original line number Diff line number Diff line
@@ -452,6 +452,10 @@ public final class AudioAttributes implements Parcelable { 
            | FLAG_NO_SYSTEM_CAPTURE | FLAG_CAPTURE_PRIVATE;

    private final static int FLAG_ALL_PUBLIC = FLAG_AUDIBILITY_ENFORCED |

            FLAG_HW_AV_SYNC | FLAG_LOW_LATENCY;

    /* mask of flags that can be set by SDK and System APIs through the Builder */

    private static final int FLAG_ALL_API_SET = FLAG_ALL_PUBLIC

            | FLAG_BYPASS_INTERRUPTION_POLICY

            | FLAG_BYPASS_MUTE;



    /**

     * Indicates that the audio may be captured by any app.
@@ -838,7 +842,7 @@ public final class AudioAttributes implements Parcelable { 
         * @return the same Builder instance.

         */

        public Builder setFlags(int flags) {

            flags &= AudioAttributes.FLAG_ALL_PUBLIC;

            flags &= AudioAttributes.FLAG_ALL_API_SET;

            mFlags |= flags;

            return this;

        }