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

Merge "Make SchemeInitData constructor public API"

Browse Source
This commit is contained in:
Santiago Seifert
2020-09-19 23:36:16 +00:00
committed by Android (Google) Code Review
parent a7c40017ff 5702f662e7
commit c6ffd8e165
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -24887,6 +24887,7 @@ package android.media {
}
public static final class DrmInitData.SchemeInitData {
ctor public DrmInitData.SchemeInitData(@NonNull java.util.UUID, @NonNull String, @NonNull byte[]);
field @NonNull public static final java.util.UUID UUID_NIL;
field public final byte[] data;
field public final String mimeType;

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

@@ -87,13 +87,13 @@ public abstract class DrmInitData {
public final byte[] data;
/**
* Creates a new instance with the given values.
*
* @param uuid The UUID associated with this scheme initialization data.
* @param mimeType The mimeType of the initialization data.
* @param data The initialization data.
*
* @hide
*/
public SchemeInitData(UUID uuid, String mimeType, byte[] data) {
public SchemeInitData(@NonNull UUID uuid, @NonNull String mimeType, @NonNull byte[] data) {
this.uuid = uuid;
this.mimeType = mimeType;
this.data = data;

1
non-updatable-api/current.txt
View File

@@ -24869,6 +24869,7 @@ package android.media {
}
public static final class DrmInitData.SchemeInitData {
ctor public DrmInitData.SchemeInitData(@NonNull java.util.UUID, @NonNull String, @NonNull byte[]);
field @NonNull public static final java.util.UUID UUID_NIL;
field public final byte[] data;
field public final String mimeType;