From 5702f662e74c2f8959af3ac756fe208110bdbe3d Mon Sep 17 00:00:00 2001 From: Santiago Seifert Date: Mon, 14 Sep 2020 19:25:32 +0100 Subject: [PATCH] Make SchemeInitData constructor public API MediaParser (media mainline module) implements DrmInitData but is forced to create instances by reflection because the SchemeInitData constructor is hidden. Bug: 158743263 Test: atest CtsMediaTestCases:android.media.cts.DrmInitDataTest Change-Id: Icc1f2d32994f128580fabc641f3a23db36e7935a --- api/current.txt | 1 + media/java/android/media/DrmInitData.java | 6 +++--- non-updatable-api/current.txt | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/api/current.txt b/api/current.txt index ab25fef4b6116..1a9b2bc15a5bf 100644 --- a/api/current.txt +++ b/api/current.txt @@ -24877,6 +24877,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; diff --git a/media/java/android/media/DrmInitData.java b/media/java/android/media/DrmInitData.java index d803311fdae3a..85b4ba54de630 100644 --- a/media/java/android/media/DrmInitData.java +++ b/media/java/android/media/DrmInitData.java @@ -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; diff --git a/non-updatable-api/current.txt b/non-updatable-api/current.txt index 8ec947ebf89e5..060d3f21716df 100644 --- a/non-updatable-api/current.txt +++ b/non-updatable-api/current.txt @@ -24859,6 +24859,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;