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

Commit c6ffd8e1 authored by Santiago Seifert's avatar Santiago Seifert Committed by Android (Google) Code Review
Browse files

Merge "Make SchemeInitData constructor public API"

parents a7c40017 5702f662

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -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;

























media/java/android/media/DrmInitData.java



+3
−3




























Original line number
Diff line number
Diff line








@@ -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;

































non-updatable-api/current.txt



+1
−0




























Original line number
Diff line number
Diff line








@@ -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;