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

Commit 4b1a00ed authored by Jeff Tinker's avatar Jeff Tinker Committed by android-build-merger
Browse files

Merge "Fix StringDef usage in MediaDrm API" into oc-dev 

am: d2b1f381

Change-Id: Ide47e76bd45fe1f50588b4d2fc3f124196ec9769
parents b0d3b3a5 d2b1f381

media/java/android/media/MediaDrm.java

+2 −2
Original line number Diff line number Diff line
@@ -1021,13 +1021,13 @@ public final class MediaDrm { 
     * Set a DRM engine plugin String property value.

     */

    public native void setPropertyString(

            @StringProperty String propertyName, @NonNull String value);

            String propertyName, @NonNull String value);



    /**

     * Set a DRM engine plugin byte array property value.

     */

    public native void setPropertyByteArray(

            @ArrayProperty String propertyName, @NonNull byte[] value);

            String propertyName, @NonNull byte[] value);



    private static final native void setCipherAlgorithmNative(

            @NonNull MediaDrm drm, @NonNull byte[] sessionId, @NonNull String algorithm);