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

Commit 0ccaa4af 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 

am: 4b1a00ed

Change-Id: I76c1568e4617887d65305bd8dbc62f1d1e95f178
parents daaec973 4b1a00ed

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