diff options
| author | Jeff Tinker <jtinker@google.com> | 2014-12-08 19:35:59 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-08 19:35:59 +0000 |
| commit | f062d8d7df6b6ca72f103d133a3483cd91c95c60 (patch) | |
| tree | 91efa05c3b600b48f2be5db2dff143cf3b5269cd /media | |
| parent | 5a181a2436fb629c2298b9bfb0b2848b514edbe6 (diff) | |
| parent | b15a57d64d39315a9c1331d74a1ff5821f8b14d1 (diff) | |
| download | frameworks_base-f062d8d7df6b6ca72f103d133a3483cd91c95c60.zip frameworks_base-f062d8d7df6b6ca72f103d133a3483cd91c95c60.tar.gz frameworks_base-f062d8d7df6b6ca72f103d133a3483cd91c95c60.tar.bz2 | |
am b15a57d6: am 82cc1c5a: Merge "Unhide secure stop APIs" into lmp-mr1-dev
* commit 'b15a57d64d39315a9c1331d74a1ff5821f8b14d1':
Unhide secure stop APIs
Diffstat (limited to 'media')
| -rw-r--r-- | media/java/android/media/MediaDrm.java | 4 |
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(); |