From 846e712dc72c0721131413bcae48f3d8b923411b Mon Sep 17 00:00:00 2001 From: Jeff Tinker Date: Wed, 19 Nov 2014 14:50:58 -0800 Subject: [PATCH] Unhide secure stop APIs Change-Id: If25406a6657c8f9d558e659bf5af73bac9bc434c related-to-bug: 18053197 related-to-bug: 18076411 --- api/current.txt | 2 ++ media/java/android/media/MediaDrm.java | 4 ---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/api/current.txt b/api/current.txt index 98bfd50f72faf..25b36b6fa6835 100644 --- a/api/current.txt +++ b/api/current.txt @@ -14840,6 +14840,7 @@ package android.media { method public byte[] getPropertyByteArray(java.lang.String); method public java.lang.String getPropertyString(java.lang.String); method public android.media.MediaDrm.ProvisionRequest getProvisionRequest(); + method public byte[] getSecureStop(byte[]); method public java.util.List getSecureStops(); method public static final boolean isCryptoSchemeSupported(java.util.UUID); method public static final boolean isCryptoSchemeSupported(java.util.UUID, java.lang.String); @@ -14848,6 +14849,7 @@ package android.media { method public void provideProvisionResponse(byte[]) throws android.media.DeniedByServerException; method public java.util.HashMap queryKeyStatus(byte[]); method public final void release(); + method public void releaseAllSecureStops(); method public void releaseSecureStops(byte[]); method public void removeKeys(byte[]); method public void restoreKeys(byte[], byte[]); diff --git a/media/java/android/media/MediaDrm.java b/media/java/android/media/MediaDrm.java index 79598412999e9..78a5abe5f860b 100644 --- a/media/java/android/media/MediaDrm.java +++ b/media/java/android/media/MediaDrm.java @@ -576,8 +576,6 @@ public final class MediaDrm { * Access secure stop by secure stop ID. * * @param ssid - The secure stop ID provided by the license server. - * - * @hide - not part of the public API at this time */ public native byte[] getSecureStop(byte[] ssid); @@ -591,8 +589,6 @@ public final class MediaDrm { /** * Remove all secure stops without requiring interaction with the server. - * - * @hide - not part of the public API at this time */ public native void releaseAllSecureStops();