From d8ffd7dffe5bce3f315fe7db53248cc5f52070ec Mon Sep 17 00:00:00 2001 From: Jeff Tinker Date: Wed, 5 Apr 2017 08:27:14 -0700 Subject: [PATCH] Clarify MediaDrm#getKeyRequest docs: init and mimeType MediaDrm getKeyRequest works fine even if init and mimeType parameters are null when releasing or renewing a key. bug: 33375079 Change-Id: I707874c8f4f26bf8b23b270331680f69833ae14f --- media/java/android/media/MediaDrm.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/media/java/android/media/MediaDrm.java b/media/java/android/media/MediaDrm.java index 2723826cc92e6..7ca42ea1146c8 100644 --- a/media/java/android/media/MediaDrm.java +++ b/media/java/android/media/MediaDrm.java @@ -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.