am b15a57d6: am 82cc1c5a: Merge "Unhide secure stop APIs" into lmp-mr1-dev
* commit 'b15a57d64d39315a9c1331d74a1ff5821f8b14d1':
Unhide secure stop APIs
diff --git a/api/current.txt b/api/current.txt
index 98bfd50..25b36b6 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -14840,6 +14840,7 @@
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<byte[]> 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 @@
method public void provideProvisionResponse(byte[]) throws android.media.DeniedByServerException;
method public java.util.HashMap<java.lang.String, java.lang.String> 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 7959841..78a5abe 100644
--- a/media/java/android/media/MediaDrm.java
+++ b/media/java/android/media/MediaDrm.java
@@ -576,8 +576,6 @@
* 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 @@
/**
* Remove all secure stops without requiring interaction with the server.
- *
- * @hide - not part of the public API at this time
*/
public native void releaseAllSecureStops();