summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jeff Tinker <jtinker@google.com> 2017-04-05 09:00:42 -0700
committer Jeff Tinker <jtinker@google.com> 2017-04-05 09:00:42 -0700
commit0ca35ac9f0feda22f2b4d2f52f7e6ccd3caee878 (patch)
tree23f4c2b561a5d7b5cfb9d8b0f45f1fa3623eca32
parent7458ea38278da47e6ecc0cd251566cdd10063215 (diff)
Fix StringDef usage in MediaDrm API
Remove @StringProperty and @ArrayProperty annotations bug:32137960 Change-Id: Id8fac0b18f9e663f235f7f8ae8ac8b1240657df0
-rw-r--r--media/java/android/media/MediaDrm.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/media/java/android/media/MediaDrm.java b/media/java/android/media/MediaDrm.java
index 2723826cc92e..f013d119c19d 100644
--- a/media/java/android/media/MediaDrm.java
+++ b/media/java/android/media/MediaDrm.java
@@ -1014,13 +1014,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);