diff options
| author | 2022-10-19 11:20:52 +0000 | |
|---|---|---|
| committer | 2022-10-19 11:20:52 +0000 | |
| commit | cf00b5bfff544ab8afbd406f20e140ae63c3bb4d (patch) | |
| tree | c7950e3b108db8c8b3d64e5cf0d00ae2d4ec34d7 | |
| parent | b39c5a816c1ad1ec932948986bd694a639dab25a (diff) | |
| parent | ca79065217c603264f6082f421152f7a674c5754 (diff) | |
Merge "Clarify that MediaCrypto.setMediaDrmSession cannot switch DRM schemes" am: 258d8f6321 am: 8640d2a406 am: ca79065217
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2260581
Change-Id: I3c74008efa832fd9df5954b93c08a764ac59fe63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | media/java/android/media/MediaCrypto.java | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/media/java/android/media/MediaCrypto.java b/media/java/android/media/MediaCrypto.java index 889a5f7efbb2..1930262ea253 100644 --- a/media/java/android/media/MediaCrypto.java +++ b/media/java/android/media/MediaCrypto.java @@ -75,14 +75,17 @@ public final class MediaCrypto { public final native boolean requiresSecureDecoderComponent(@NonNull String mime); /** - * Associate a MediaDrm session with this MediaCrypto instance. The - * MediaDrm session is used to securely load decryption keys for a - * crypto scheme. The crypto keys loaded through the MediaDrm session + * Associate a new MediaDrm session with this MediaCrypto instance. + * + * <p>The MediaDrm session is used to securely load decryption keys for a + * crypto scheme. The crypto keys loaded through the MediaDrm session * may be selected for use during the decryption operation performed * by {@link android.media.MediaCodec#queueSecureInputBuffer} by specifying - * their key ids in the {@link android.media.MediaCodec.CryptoInfo#key} field. - * @param sessionId the MediaDrm sessionId to associate with this - * MediaCrypto instance + * their key IDs in the {@link android.media.MediaCodec.CryptoInfo#key} field. + * + * @param sessionId The MediaDrm sessionId to associate with this MediaCrypto + * instance. The session's scheme must match the scheme UUID used when + * constructing this MediaCrypto instance. * @throws MediaCryptoException on failure to set the sessionId */ public final native void setMediaDrmSession(@NonNull byte[] sessionId) |