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

Merge "Update MediaDrm documentation for provideKeyResponse" into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-04-06 06:06:48 +00:00
committed by Android (Google) Code Review
parent 0c5dfd90b8 2bc391f567
commit ff8bf0cc95
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -779,13 +779,17 @@ public final class MediaDrm {
* response is for an offline key request, a keySetId is returned that can be * response is for an offline key request, a keySetId is returned that can be
* used to later restore the keys to a new session with the method * used to later restore the keys to a new session with the method
* {@link #restoreKeys}. * {@link #restoreKeys}.
* When the response is for a streaming or release request, null is returned. * When the response is for a streaming or release request, an empty byte array
* is returned.
* *
* @param scope may be a sessionId or keySetId depending on the type of the * @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 * 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 * streaming or offline key requests. Scope should be set to the keySetId when
* the response is for a release request. * 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
* @return If the response is for an offline request, the keySetId for the offline
* keys will be returned. If the response is for a streaming or release request
* an empty byte array will be returned.
* *
* @throws NotProvisionedException if the response indicates that * @throws NotProvisionedException if the response indicates that
* reprovisioning is required * reprovisioning is required