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

Commit 007d4e3f authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Expose MediaMuxer.OutputFormat.MUXER_OUTPUT_{FIRST,LAST}" into main

parents e6e89271 7d9cba32

core/api/test-current.txt

+5 −0
Original line number Diff line number Diff line
@@ -2113,6 +2113,11 @@ package android.media { 
    method public boolean isAidlHal();

  }



  public static final class MediaMuxer.OutputFormat {

    field public static final int MUXER_OUTPUT_FIRST = 0; // 0x0

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

  }



  public final class MediaRoute2Info implements android.os.Parcelable {

    method @NonNull public String getOriginalId();

  }

core/api/test-lint-baseline.txt

+4 −0
Original line number Diff line number Diff line
@@ -2059,6 +2059,10 @@ UnflaggedApi: android.media.AudioManager#getFocusFadeOutDurationForTest(): 
    New API must be flagged with @FlaggedApi: method android.media.AudioManager.getFocusFadeOutDurationForTest()

UnflaggedApi: android.media.AudioManager#getFocusUnmuteDelayAfterFadeOutForTest():

    New API must be flagged with @FlaggedApi: method android.media.AudioManager.getFocusUnmuteDelayAfterFadeOutForTest()

UnflaggedApi: android.media.MediaMuxer.OutputFormat#MUXER_OUTPUT_FIRST:

    New API must be flagged with @FlaggedApi: field android.media.MediaMuxer.OutputFormat.MUXER_OUTPUT_FIRST

UnflaggedApi: android.media.MediaMuxer.OutputFormat#MUXER_OUTPUT_LAST:

    New API must be flagged with @FlaggedApi: field android.media.MediaMuxer.OutputFormat.MUXER_OUTPUT_LAST

UnflaggedApi: android.media.RingtoneSelection:

    New API must be flagged with @FlaggedApi: class android.media.RingtoneSelection

UnflaggedApi: android.media.RingtoneSelection#DEFAULT_SELECTION_URI_STRING:

media/java/android/media/MediaMuxer.java

+6 −0
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ package android.media; 


import android.annotation.IntDef;

import android.annotation.NonNull;

import android.annotation.SuppressLint;

import android.annotation.TestApi;

import android.compat.annotation.UnsupportedAppUsage;

import android.media.MediaCodec.BufferInfo;

import android.os.Build;
@@ -257,6 +259,8 @@ final public class MediaMuxer { 
         */

        private OutputFormat() {}

        /** @hide */

        @SuppressLint("UnflaggedApi")

        @TestApi

        public static final int MUXER_OUTPUT_FIRST   = 0;

        /** MPEG4 media file format*/

        public static final int MUXER_OUTPUT_MPEG_4 = MUXER_OUTPUT_FIRST;
@@ -269,6 +273,8 @@ final public class MediaMuxer { 
        /** Ogg media file format*/

        public static final int MUXER_OUTPUT_OGG   = MUXER_OUTPUT_FIRST + 4;

        /** @hide */

        @SuppressLint("UnflaggedApi")

        @TestApi

        public static final int MUXER_OUTPUT_LAST   = MUXER_OUTPUT_OGG;

    };