summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorJeff Tinker <jtinker@google.com>2014-11-19 14:50:58 -0800
committerJeff Tinker <jtinker@google.com>2014-12-05 15:44:17 -0800
commit846e712dc72c0721131413bcae48f3d8b923411b (patch)
tree586a88d1a3b5e9d7ceb87f53c20a6ee397bce434 /media
parent968ef51c679105df4770a2d04b506a7f5ffacaf8 (diff)
downloadframeworks_base-846e712dc72c0721131413bcae48f3d8b923411b.zip
frameworks_base-846e712dc72c0721131413bcae48f3d8b923411b.tar.gz
frameworks_base-846e712dc72c0721131413bcae48f3d8b923411b.tar.bz2
Unhide secure stop APIs
Change-Id: If25406a6657c8f9d558e659bf5af73bac9bc434c related-to-bug: 18053197 related-to-bug: 18076411
Diffstat (limited to 'media')
-rw-r--r--media/java/android/media/MediaDrm.java4
1 files changed, 0 insertions, 4 deletions
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 @@ 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();