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

Commit f25495c5 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Clarify use of initData in MediaCrypto constructor"

parents dcd0b0ab 46a5d768
Loading
Loading
Loading
Loading
+7 −5
Original line number Diff line number Diff line
@@ -56,13 +56,15 @@ public final class MediaCrypto {
    private static final native boolean isCryptoSchemeSupportedNative(@NonNull byte[] uuid);

    /**
     * Instantiate a MediaCrypto object using opaque, crypto scheme specific
     * data.
     * Instantiate a MediaCrypto object and associate it with a MediaDrm session
     *
     * @param uuid The UUID of the crypto scheme.
     * @param initData Opaque initialization data specific to the crypto scheme.
     * @param sessionId The MediaDrm sessionId to associate with this
     * MediaCrypto session. The sessionId may be changed after the MediaCrypto
     * is created using {@link #setMediaDrmSession}
     */
    public MediaCrypto(@NonNull UUID uuid, @NonNull byte[] initData) throws MediaCryptoException {
        native_setup(getByteArrayFromUUID(uuid), initData);
    public MediaCrypto(@NonNull UUID uuid, @NonNull byte[] sessionId) throws MediaCryptoException {
        native_setup(getByteArrayFromUUID(uuid), sessionId);
    }

    /**