drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Correct java API docs for MediaDrm offline use case" into jb-mr2-dev

Browse Source
This commit is contained in:
Jeff Tinker
2013-05-07 22:36:50 +00:00
committed by Android (Google) Code Review
parent e2322bdd78 ea824eddbc
commit 02f7f44973
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -363,11 +363,16 @@ public final class MediaDrm {
/** /**
* A key response is received from the license server by the app, then it is * A key response is received from the license server by the app, then it is
* provided to the DRM engine plugin using provideKeyResponse. The byte array * provided to the DRM engine plugin using provideKeyResponse. When the
* returned is a keySetId that can be used to later restore the keys to a new * response is for an offline key request, a keySetId is returned that can be
* session with the method {@link #restoreKeys}, enabling offline key use. * used to later restore the keys to a new session with the method
* {@link #restoreKeys}.
* When the response is for a streaming or release request, null is returned.
* *
* @param sessionId the session ID for the DRM session * @param scope may be a sessionId or keySetId depending on the type of the
* response. Scope should be set to the sessionId when the response is for either
* streaming or offline key requests. Scope should be set to the keySetId when
* the response is for a release request.
* @param response the byte array response from the server * @param response the byte array response from the server
* *
* @throws NotProvisionedException if the response indicates that * @throws NotProvisionedException if the response indicates that
@ -375,7 +380,7 @@ public final class MediaDrm {
* @throws DeniedByServerException if the response indicates that the * @throws DeniedByServerException if the response indicates that the
* server rejected the request * server rejected the request
*/ */
public native byte[] provideKeyResponse(byte[] sessionId, byte[] response) public native byte[] provideKeyResponse(byte[] scope, byte[] response)
throws NotProvisionedException, DeniedByServerException; throws NotProvisionedException, DeniedByServerException;