From 68c12432cb257791e64442e67b46bf73ce256949 Mon Sep 17 00:00:00 2001 From: Robert Shih Date: Wed, 13 Mar 2019 13:24:53 -0700 Subject: [PATCH] MediaDrm: @Deprecate SecurityLevel & HdcpLevel Bug: 127625289 Test: compiles Change-Id: Iaf18775d210ae280499a7ef059a46479b449fe5b --- api/current.txt | 4 ++-- media/java/android/media/MediaDrm.java | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/api/current.txt b/api/current.txt index 5e0f996c166f6..8fa78151b138e 100644 --- a/api/current.txt +++ b/api/current.txt @@ -24842,7 +24842,7 @@ package android.media { method public boolean verify(@NonNull byte[], @NonNull byte[], @NonNull byte[]); } - @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) @IntDef({android.media.MediaDrm.HDCP_LEVEL_UNKNOWN, android.media.MediaDrm.HDCP_NONE, android.media.MediaDrm.HDCP_V1, android.media.MediaDrm.HDCP_V2, android.media.MediaDrm.HDCP_V2_1, android.media.MediaDrm.HDCP_V2_2, android.media.MediaDrm.HDCP_V2_3, android.media.MediaDrm.HDCP_NO_DIGITAL_OUTPUT}) public static @interface MediaDrm.HdcpLevel { + @Deprecated @IntDef({android.media.MediaDrm.HDCP_LEVEL_UNKNOWN, android.media.MediaDrm.HDCP_NONE, android.media.MediaDrm.HDCP_V1, android.media.MediaDrm.HDCP_V2, android.media.MediaDrm.HDCP_V2_1, android.media.MediaDrm.HDCP_V2_2, android.media.MediaDrm.HDCP_V2_3, android.media.MediaDrm.HDCP_NO_DIGITAL_OUTPUT}) @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) public static @interface MediaDrm.HdcpLevel { } public static final class MediaDrm.KeyRequest { @@ -24929,7 +24929,7 @@ package android.media { method @NonNull public String getDefaultUrl(); } - @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) @IntDef({android.media.MediaDrm.SECURITY_LEVEL_UNKNOWN, android.media.MediaDrm.SECURITY_LEVEL_SW_SECURE_CRYPTO, android.media.MediaDrm.SECURITY_LEVEL_SW_SECURE_DECODE, android.media.MediaDrm.SECURITY_LEVEL_HW_SECURE_CRYPTO, android.media.MediaDrm.SECURITY_LEVEL_HW_SECURE_DECODE, android.media.MediaDrm.SECURITY_LEVEL_HW_SECURE_ALL}) public static @interface MediaDrm.SecurityLevel { + @Deprecated @IntDef({android.media.MediaDrm.SECURITY_LEVEL_UNKNOWN, android.media.MediaDrm.SECURITY_LEVEL_SW_SECURE_CRYPTO, android.media.MediaDrm.SECURITY_LEVEL_SW_SECURE_DECODE, android.media.MediaDrm.SECURITY_LEVEL_HW_SECURE_CRYPTO, android.media.MediaDrm.SECURITY_LEVEL_HW_SECURE_DECODE, android.media.MediaDrm.SECURITY_LEVEL_HW_SECURE_ALL}) @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) public static @interface MediaDrm.SecurityLevel { } public static final class MediaDrm.SessionException extends java.lang.RuntimeException { diff --git a/media/java/android/media/MediaDrm.java b/media/java/android/media/MediaDrm.java index f5abb2482a7ff..2c53d8ce545e5 100644 --- a/media/java/android/media/MediaDrm.java +++ b/media/java/android/media/MediaDrm.java @@ -1363,6 +1363,7 @@ public final class MediaDrm implements AutoCloseable { removeAllSecureStops();; } + @Deprecated @Retention(RetentionPolicy.SOURCE) @IntDef({HDCP_LEVEL_UNKNOWN, HDCP_NONE, HDCP_V1, HDCP_V2, HDCP_V2_1, HDCP_V2_2, HDCP_V2_3, HDCP_NO_DIGITAL_OUTPUT}) @@ -1456,6 +1457,7 @@ public final class MediaDrm implements AutoCloseable { * Security level indicates the robustness of the device's DRM * implementation. */ + @Deprecated @Retention(RetentionPolicy.SOURCE) @IntDef({SECURITY_LEVEL_UNKNOWN, SECURITY_LEVEL_SW_SECURE_CRYPTO, SECURITY_LEVEL_SW_SECURE_DECODE, SECURITY_LEVEL_HW_SECURE_CRYPTO,