Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ca790652 authored by Ian Baker's avatar Ian Baker Committed by Automerger Merge Worker
Browse files

Merge "Clarify that MediaCrypto.setMediaDrmSession cannot switch DRM schemes"... 

Merge "Clarify that MediaCrypto.setMediaDrmSession cannot switch DRM schemes" am: 258d8f63 am: 8640d2a4

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2260581



Change-Id: Ie3785db02795c98961a72fce8df5918e56a534fb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 570e3055 8640d2a4

media/java/android/media/MediaCrypto.java

+9 −6
Original line number Diff line number Diff line
@@ -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

     * 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)