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

Commit 77f5bbc8 authored May 13, 2022 by Automerger Merge Worker

Merge "Merge "Unhide LogSessionId constant." am: 2274d85f am: fd51a9fc am:...

Merge "Merge "Unhide LogSessionId constant." am: 2274d85f am: fd51a9fc am: ac7808eb" into tm-d1-dev-plus-aosp am: cd464c7f am: afbbf255

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

Change-Id: I9f3ec454e3e8a49e42df03f0449bd883b24b2504
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 103cc826 afbbf255

core/api/current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -22313,6 +22313,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_AAC_ELD = "audio/mp4a.40.39";
		field public static final String MIMETYPE_AUDIO_AAC_HE_V1 = "audio/mp4a.40.05";

media/java/android/media/MediaFormat.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -291,9 +291,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";