summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jeff Tinker <jtinker@google.com> 2018-04-03 00:16:19 +0000
committer android-build-merger <android-build-merger@google.com> 2018-04-03 00:16:19 +0000
commitd2dc31b5b847c77048657e5ef10058ade64fc9f8 (patch)
treea6c94a05903710f5b16409800d887aab5f9d568e
parent558e9116fb0e027c8249cf3116f81b9457082a59 (diff)
parent1c967fe075ba6adaf127ae741ff177434c5bd866 (diff)
Merge "Updates MediaDrm developer docs" into pi-dev
am: 1c967fe075 Change-Id: I218679fc0cf338389dfb489ba591d3480601280f
-rw-r--r--media/java/android/media/MediaDrm.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/media/java/android/media/MediaDrm.java b/media/java/android/media/MediaDrm.java
index 51737437d692..7ac15290151c 100644
--- a/media/java/android/media/MediaDrm.java
+++ b/media/java/android/media/MediaDrm.java
@@ -993,6 +993,9 @@ public final class MediaDrm implements AutoCloseable {
* active. The license server returns a secure stop release response
* message to the app which then deletes the secure stop from persistent
* memory using {@link #releaseSecureStops}.
+ * <p>
+ * Each secure stop has a unique ID that can be used to identify it during
+ * enumeration, access and removal.
* @return a list of all secure stops from secure persistent memory
*/
@NonNull
@@ -1000,6 +1003,8 @@ public final class MediaDrm implements AutoCloseable {
/**
* Return a list of all secure stop IDs currently in persistent memory.
+ * The secure stop ID can be used to access or remove the corresponding
+ * secure stop.
*
* @return a list of secure stop IDs
*/
@@ -1008,6 +1013,7 @@ public final class MediaDrm implements AutoCloseable {
/**
* Access a specific secure stop given its secure stop ID.
+ * Each secure stop has a unique ID.
*
* @param ssid the ID of the secure stop to return
* @return the secure stop identified by ssid