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

Commit fada3e34 authored by Dichen Zhang's avatar Dichen Zhang Committed by Automerger Merge Worker
Browse files

Merge "Fix javadoc error for MediaFormat.KEY_BITRATE_MODE" am: b7c18f23 am:... 

Merge "Fix javadoc error for MediaFormat.KEY_BITRATE_MODE" am: b7c18f23 am: a31af1d4 am: 73f2de36 am: f9bd146c am: 3ac245e7

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



Change-Id: Ibebd8da86dafb0a43eb00ad07485ca380c3cc3fd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 00d18784 3ac245e7

media/java/android/media/MediaFormat.java

+1 −1
Original line number Diff line number Diff line
@@ -1210,7 +1210,7 @@ public final class MediaFormat { 


    /**

     * A key describing the desired bitrate mode to be used by an encoder.

     * Constants are declared in {@link MediaCodecInfo.CodecCapabilities}.

     * Constants are declared in {@link MediaCodecInfo.EncoderCapabilities}.

     *

     * @see MediaCodecInfo.EncoderCapabilities#isBitrateModeSupported(int)

     */