From 42c3d4bcfa9703e50a76ee6e1f55c3777c32e8df Mon Sep 17 00:00:00 2001 From: Santiago Seifert Date: Wed, 19 Feb 2020 15:36:07 +0000 Subject: [PATCH] Deprecate DrmInitData.get(UUID) And point users to use getSchemeInitDataCount and getSchemeInitDataAt instead. Bug: 132153067 Test: No behavioral change. Change-Id: Ie50067ebdc408481fc69167deab4ebfd376b3543 --- api/current.txt | 2 +- media/java/android/media/DrmInitData.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/api/current.txt b/api/current.txt index 8fe79f20b6015..1e65e7bdfc9e1 100644 --- a/api/current.txt +++ b/api/current.txt @@ -24788,7 +24788,7 @@ package android.media { } public abstract class DrmInitData { - method public abstract android.media.DrmInitData.SchemeInitData get(java.util.UUID); + method @Deprecated public abstract android.media.DrmInitData.SchemeInitData get(java.util.UUID); method @NonNull public android.media.DrmInitData.SchemeInitData getSchemeInitDataAt(int); method public int getSchemeInitDataCount(); } diff --git a/media/java/android/media/DrmInitData.java b/media/java/android/media/DrmInitData.java index cc35f140dd7e0..d803311fdae3a 100644 --- a/media/java/android/media/DrmInitData.java +++ b/media/java/android/media/DrmInitData.java @@ -37,7 +37,9 @@ public abstract class DrmInitData { * * @param schemeUuid The DRM scheme's UUID. * @return The initialization data for the scheme, or null if the scheme is not supported. + * @deprecated Use {@link #getSchemeInitDataCount} and {@link #getSchemeInitDataAt} instead. */ + @Deprecated public abstract SchemeInitData get(UUID schemeUuid); /**