summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Robert Shih <robertshih@google.com> 2023-02-24 09:15:50 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-02-24 09:15:50 +0000
commitdd7364cda421a46db3c3559cff1e7ac935d615c8 (patch)
tree51a87a719cdaf2769a8a64dcdbeb4d4117802ad0
parent286f21bd7260c386a4414d3d76770045d621fa25 (diff)
parent5a297d5d3934a5d8e68bc8c84d578cbf5f5bb3ff (diff)
Merge "Fix MediaDrm.PlaybackComponent#setLogSessionId doc" am: a20d36c086 am: 5a297d5d39
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2000331 Change-Id: I4fae86a16ba18f6a678c0c3bd10cf42545ea06e3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--media/java/android/media/MediaDrm.java8
1 files changed, 7 insertions, 1 deletions
diff --git a/media/java/android/media/MediaDrm.java b/media/java/android/media/MediaDrm.java
index a3fa43d687c3..c8d44b2e850f 100644
--- a/media/java/android/media/MediaDrm.java
+++ b/media/java/android/media/MediaDrm.java
@@ -3049,7 +3049,13 @@ public final class MediaDrm implements AutoCloseable {
/**
- * Gets the {@link LogSessionId}.
+ * Sets the {@link LogSessionId}.
+ *
+ * <p>The implementation of this method varies by DRM provider; Please refer
+ * to your DRM provider documentation for more details on this method.
+ *
+ * @throws UnsupportedOperationException when the vendor plugin does not
+ * implement this method
*/
public void setLogSessionId(@NonNull LogSessionId logSessionId) {
Objects.requireNonNull(logSessionId);