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

Commit 529664cc authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "media: fix MediaMetadataRetriever Option Intdef" into main am:... 

Merge "media: fix MediaMetadataRetriever Option Intdef" into main am: c1abb721 am: e603518e am: eae7a313 am: e3466ca1

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



Change-Id: If9eb5e908adbf0dfc7de5432d057e9a37d000752
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 313cb441 e3466ca1

media/java/android/media/MediaMetadataRetriever.java

+1 −1
Original line number Diff line number Diff line
@@ -1155,7 +1155,7 @@ public class MediaMetadataRetriever implements AutoCloseable { 
    public static final int OPTION_CLOSEST          = 0x03;



    /** @hide */

    @IntDef(flag = true, prefix = { "OPTION_" }, value = {

    @IntDef(flag = false, prefix = { "OPTION_" }, value = {

            OPTION_PREVIOUS_SYNC,

            OPTION_NEXT_SYNC,

            OPTION_CLOSEST_SYNC,