diff options
| author | 2017-04-06 17:50:18 +0000 | |
|---|---|---|
| committer | 2017-04-06 17:50:27 +0000 | |
| commit | d2b1f3812cc6046fd40b4bfd3bbdaca6b53ba4e3 (patch) | |
| tree | 71ff59236d75c93ca3556c823ee7b071b535aa82 | |
| parent | cfeb32287a5882a1c0fcbb26e58953e8b234c899 (diff) | |
| parent | 0ca35ac9f0feda22f2b4d2f52f7e6ccd3caee878 (diff) | |
Merge "Fix StringDef usage in MediaDrm API" into oc-dev
| -rw-r--r-- | media/java/android/media/MediaDrm.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/java/android/media/MediaDrm.java b/media/java/android/media/MediaDrm.java index 97dd9337fc61..b8d1d12b350e 100644 --- a/media/java/android/media/MediaDrm.java +++ b/media/java/android/media/MediaDrm.java @@ -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); |