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

Commit 6c99a727 authored Nov 18, 2024 by Treehugger Robot Committed by Automerger Merge Worker Nov 18, 2024

Merge "media: Hide *_TRUSTED_CONTENT_ONLY constants" into main am: 0d561369 am: 2cf32606

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

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

parents b245e1c0 2cf32606

core/api/current.txt

+0 −2

Original line number	Diff line number	Diff line
		@@ -23190,7 +23190,6 @@ package android.media {
		method public boolean isVendor();
		field @FlaggedApi("android.media.codec.in_process_sw_audio_codec") public static final int SECURITY_MODEL_MEMORY_SAFE = 1; // 0x1
		field @FlaggedApi("android.media.codec.in_process_sw_audio_codec") public static final int SECURITY_MODEL_SANDBOXED = 0; // 0x0
		field @FlaggedApi("android.media.codec.in_process_sw_audio_codec") public static final int SECURITY_MODEL_TRUSTED_CONTENT_ONLY = 2; // 0x2
		}

		public static final class MediaCodecInfo.AudioCapabilities {
		@@ -24081,7 +24080,6 @@ package android.media {
		field public static final int COLOR_TRANSFER_ST2084 = 6; // 0x6
		field @FlaggedApi("android.media.codec.in_process_sw_audio_codec") public static final int FLAG_SECURITY_MODEL_MEMORY_SAFE = 2; // 0x2
		field @FlaggedApi("android.media.codec.in_process_sw_audio_codec") public static final int FLAG_SECURITY_MODEL_SANDBOXED = 1; // 0x1
		field @FlaggedApi("android.media.codec.in_process_sw_audio_codec") public static final int FLAG_SECURITY_MODEL_TRUSTED_CONTENT_ONLY = 4; // 0x4
		field public static final String KEY_AAC_DRC_ALBUM_MODE = "aac-drc-album-mode";
		field public static final String KEY_AAC_DRC_ATTENUATION_FACTOR = "aac-drc-cut-level";
		field public static final String KEY_AAC_DRC_BOOST_FACTOR = "aac-drc-boost-level";

media/java/android/media/MediaCodecInfo.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -1876,6 +1876,8 @@ public final class MediaCodecInfo {
		* Codecs with this security model is not included in
		* {@link MediaCodecList#REGULAR_CODECS}, but included in
		* {@link MediaCodecList#ALL_CODECS}.
		*
		* @hide
		*/
		@FlaggedApi(FLAG_IN_PROCESS_SW_AUDIO_CODEC)
		public static final int SECURITY_MODEL_TRUSTED_CONTENT_ONLY = 2;

media/java/android/media/MediaFormat.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -1748,6 +1748,7 @@ public final class MediaFormat {
		(1 << MediaCodecInfo.SECURITY_MODEL_MEMORY_SAFE);
		/**
		* Flag for {@link MediaCodecInfo#SECURITY_MODEL_TRUSTED_CONTENT_ONLY}.
		* @hide
		*/
		@FlaggedApi(FLAG_IN_PROCESS_SW_AUDIO_CODEC)
		public static final int FLAG_SECURITY_MODEL_TRUSTED_CONTENT_ONLY =
		@@ -1759,8 +1760,7 @@ public final class MediaFormat {
		* The associated value is a flag of the following values:
		* {@link FLAG_SECURITY_MODEL_SANDBOXED},
		* {@link FLAG_SECURITY_MODEL_MEMORY_SAFE},
		* {@link FLAG_SECURITY_MODEL_TRUSTED_CONTENT_ONLY}. The default value is
		* {@link FLAG_SECURITY_MODEL_SANDBOXED}.
		* The default value is {@link FLAG_SECURITY_MODEL_SANDBOXED}.
		* <p>
		* When passed to {@link MediaCodecList#findDecoderForFormat} or
		* {@link MediaCodecList#findEncoderForFormat}, MediaCodecList filters