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

Commit 0d561369 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "media: Hide *_TRUSTED_CONTENT_ONLY constants" into main

parents 0c9aa397 1ba0be0c

core/api/current.txt

+0 −2
Original line number Diff line number Diff line
@@ -22798,7 +22798,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 {










@@ -23689,7 +23688,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