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

Commit 7c36c863 authored by Eric Laurent's avatar Eric Laurent Committed by Android (Google) Code Review
Browse files

Merge "unhide AudioAttributes flag FLAG_HW_AV_SYNC" into lmp-dev

parents 36f32f1b 56340fc2

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -14047,6 +14047,7 @@ package android.media { 
    field public static final int CONTENT_TYPE_UNKNOWN = 0; // 0x0

    field public static final android.os.Parcelable.Creator CREATOR;

    field public static final int FLAG_AUDIBILITY_ENFORCED = 1; // 0x1

    field public static final int FLAG_HW_AV_SYNC = 16; // 0x10

    field public static final int USAGE_ALARM = 4; // 0x4

    field public static final int USAGE_ASSISTANCE_ACCESSIBILITY = 11; // 0xb

    field public static final int USAGE_ASSISTANCE_NAVIGATION_GUIDANCE = 12; // 0xc

media/java/android/media/AudioAttributes.java

+1 −4
Original line number Diff line number Diff line
@@ -162,16 +162,13 @@ public final class AudioAttributes implements Parcelable { 
    public final static int FLAG_BEACON = 0x1 << 3;



    /**

     * @hide

     * CANDIDATE FOR PUBLIC API

     * Flag requesting the use of an output stream supporting hardware A/V synchronization.

     */

    // TODO  add in FLAG_ALL_PUBLIC when in public API

    public final static int FLAG_HW_AV_SYNC = 0x1 << 4;



    private final static int FLAG_ALL = FLAG_AUDIBILITY_ENFORCED | FLAG_SECURE | FLAG_SCO |

            FLAG_BEACON | FLAG_HW_AV_SYNC;

    private final static int FLAG_ALL_PUBLIC = FLAG_AUDIBILITY_ENFORCED;

    private final static int FLAG_ALL_PUBLIC = FLAG_AUDIBILITY_ENFORCED | FLAG_HW_AV_SYNC;



    private int mUsage = USAGE_UNKNOWN;

    private int mContentType = CONTENT_TYPE_UNKNOWN;