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

Commit fd51a9fc authored by Ovidiu Pana's avatar Ovidiu Pana Committed by Automerger Merge Worker
Browse files

Merge "Unhide LogSessionId constant." am: 2274d85f 

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



Change-Id: I0c2c0634e9250d7d3126fee54018fdf42722f55f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 037b772f 2274d85f

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -21438,6 +21438,7 @@ package android.media { 
    field public static final String KEY_VIDEO_QP_P_MAX = "video-qp-p-max";

    field public static final String KEY_VIDEO_QP_P_MIN = "video-qp-p-min";

    field public static final String KEY_WIDTH = "width";

    field public static final String LOG_SESSION_ID = "log-session-id";

    field public static final String MIMETYPE_AUDIO_AAC = "audio/mp4a-latm";

    field public static final String MIMETYPE_AUDIO_AC3 = "audio/ac3";

    field public static final String MIMETYPE_AUDIO_AC4 = "audio/ac4";

media/java/android/media/MediaFormat.java

+3 −2
Original line number Diff line number Diff line
@@ -230,9 +230,10 @@ public final class MediaFormat { 
    /**

     * A key describing the log session ID for MediaCodec. The log session ID is a random 32-byte

     * hexadecimal string that is used to associate metrics from multiple media codec instances

     * to the same playback or recording session.

     * to the same playback or recording session. The value is created as

     * {@link android.media.metrics.LogSessionId LogSessionId}. Sessions are created in

     * {@link android.media.metrics.MediaMetricsManager MediaMetricsManager}.

     * The associated value is a string.

     * @hide

     */

    public static final String LOG_SESSION_ID = "log-session-id";