Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: d2b1f3812c

Change-Id: Ide47e76bd45fe1f50588b4d2fc3f124196ec9769
This commit is contained in:
Jeff Tinker
2017-04-06 17:56:30 +00:00
committed by android-build-merger
parent b0d3b3a5d9 d2b1f3812c
commit 4b1a00ed84
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
media/java/android/media/MediaDrm.java
View File

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