summaryrefslogtreecommitdiffstats
path: root/media/java
diff options
context:
space:
mode:
authorJeff Tinker <jtinker@google.com>2015-05-22 11:53:54 -0700
committerJeff Tinker <jtinker@google.com>2015-05-22 20:17:57 +0000
commit08cfe2a5fcb3ec68b14966233511cb7d6d15e543 (patch)
tree977d431c3496daf9314f772d4505613600cb0ce4 /media/java
parent3dcd4c8948a990dfb98b035198c076b07d115720 (diff)
downloadframeworks_base-08cfe2a5fcb3ec68b14966233511cb7d6d15e543.zip
frameworks_base-08cfe2a5fcb3ec68b14966233511cb7d6d15e543.tar.gz
frameworks_base-08cfe2a5fcb3ec68b14966233511cb7d6d15e543.tar.bz2
Doc update for MediaDrm's OnExpirationUpdate method
Based on EME spec clarification that expiration time of 0 means unlimited. bug: 21393975 Change-Id: I96e50fb4300724f52aad2ca39c8495ad1aa78222
Diffstat (limited to 'media/java')
-rw-r--r--media/java/android/media/MediaDrm.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/media/java/android/media/MediaDrm.java b/media/java/android/media/MediaDrm.java
index 52ba9ec..9acfee2 100644
--- a/media/java/android/media/MediaDrm.java
+++ b/media/java/android/media/MediaDrm.java
@@ -282,7 +282,8 @@ public final class MediaDrm {
* @param md the MediaDrm object on which the event occurred
* @param sessionId the DRM session ID on which the event occurred
* @param expirationTime the new expiration time for the keys in the session.
- * The time is in milliseconds, relative to the Unix epoch.
+ * The time is in milliseconds, relative to the Unix epoch. A time of
+ * 0 indicates that the keys never expire.
*/
void onExpirationUpdate(
@NonNull MediaDrm md, @NonNull byte[] sessionId, long expirationTime);