Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Deprecate DrmInitData.get(UUID)"

Browse Source
This commit is contained in:
Santiago Seifert
2020-02-20 12:12:06 +00:00
committed by Android (Google) Code Review
parent 0534f289df 42c3d4bcfa
commit e1fdd601f3
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -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();
}

2
media/java/android/media/DrmInitData.java
View File

@@ -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);
/**