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

Merge "Clarify MediaDrm#getKeyRequest docs: init and mimeType" into oc-dev

Browse Source 
am: 2375cd1a84

Change-Id: I54e39dfeb817b08853ec0ef48c8b70d37d8ae1c3
This commit is contained in:
Jeff Tinker
2017-04-06 06:27:16 +00:00
committed by android-build-merger
parent d506056de8 2375cd1a84
commit 99030a938c
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -753,9 +753,12 @@ public final class MediaDrm {
* @param init container-specific data, its meaning is interpreted based on the
* mime type provided in the mimeType parameter. It could contain, for example,
* the content ID, key ID or other data obtained from the content metadata that is
* required in generating the key request. init may be null when keyType is
* KEY_TYPE_RELEASE.
* @param mimeType identifies the mime type of the content
* required in generating the key request. May be null when keyType is
* KEY_TYPE_RELEASE or if the request is a renewal, i.e. not the first key
* request for the session.
* @param mimeType identifies the mime type of the content. May be null if the
* keyType is KEY_TYPE_RELEASE or if the request is a renewal, i.e. not the
* first key request for the session.
* @param keyType specifes the type of the request. The request may be to acquire
* keys for streaming or offline content, or to release previously acquired
* keys, which are identified by a keySetId.