Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Unhide secure stop APIs" into lmp-mr1-dev

Browse Source
This commit is contained in:
Jeff Tinker
2014-12-06 00:28:24 +00:00
committed by Android (Google) Code Review
parent b3898fbe07 846e712dc7
commit 82cc1c5a2d
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -14840,6 +14840,7 @@ package android.media {
method public byte[] getPropertyByteArray(java.lang.String); method public byte[] getPropertyByteArray(java.lang.String);
method public java.lang.String getPropertyString(java.lang.String); method public java.lang.String getPropertyString(java.lang.String);
method public android.media.MediaDrm.ProvisionRequest getProvisionRequest(); method public android.media.MediaDrm.ProvisionRequest getProvisionRequest();
method public byte[] getSecureStop(byte[]);
method public java.util.List<byte[]> getSecureStops(); 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);
method public static final boolean isCryptoSchemeSupported(java.util.UUID, java.lang.String); 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 void provideProvisionResponse(byte[]) throws android.media.DeniedByServerException;
method public java.util.HashMap<java.lang.String, java.lang.String> queryKeyStatus(byte[]); method public java.util.HashMap<java.lang.String, java.lang.String> queryKeyStatus(byte[]);
method public final void release(); method public final void release();
method public void releaseAllSecureStops();
method public void releaseSecureStops(byte[]); method public void releaseSecureStops(byte[]);
method public void removeKeys(byte[]); method public void removeKeys(byte[]);
method public void restoreKeys(byte[], byte[]); method public void restoreKeys(byte[], byte[]);

4
media/java/android/media/MediaDrm.java
View File

@@ -576,8 +576,6 @@ public final class MediaDrm {
* Access secure stop by secure stop ID. * Access secure stop by secure stop ID.
* *
* @param ssid - The secure stop ID provided by the license server. * @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); public native byte[] getSecureStop(byte[] ssid);
@@ -591,8 +589,6 @@ public final class MediaDrm {
/** /**
* Remove all secure stops without requiring interaction with the server. * Remove all secure stops without requiring interaction with the server.
*
* @hide - not part of the public API at this time
*/ */
public native void releaseAllSecureStops(); public native void releaseAllSecureStops();