diff options
| author | 2013-04-19 14:38:39 -0700 | |
|---|---|---|
| committer | 2013-04-19 14:38:39 -0700 | |
| commit | 89249e90faee83c6a8a0dc3dcdbe69ba64b66179 (patch) | |
| tree | 6093c1a991062f90222948025186866f82a706c9 | |
| parent | 94e602d7b5f8c6fb6dbfa71d646a96aad0354640 (diff) | |
| parent | 408e663712b7f807ff1a0859c636e2dc4f53422c (diff) | |
am 408e6637: am 26a54eca: Merge "Correct algorithm property name and clarify javadoc description of device unique id property." into jb-mr2-dev
* commit '408e663712b7f807ff1a0859c636e2dc4f53422c':
Correct algorithm property name and clarify javadoc description of device unique id property.
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | media/java/android/media/MediaDrm.java | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/api/current.txt b/api/current.txt index 5cc8455858ce..99545961698c 100644 --- a/api/current.txt +++ b/api/current.txt @@ -11852,7 +11852,7 @@ package android.media { field public static final int KEY_TYPE_OFFLINE = 2; // 0x2 field public static final int KEY_TYPE_RELEASE = 3; // 0x3 field public static final int KEY_TYPE_STREAMING = 1; // 0x1 - field public static final java.lang.String PROPERTY_ALGORITHM = "algorithm"; + field public static final java.lang.String PROPERTY_ALGORITHMS = "algorithms"; field public static final java.lang.String PROPERTY_DESCRIPTION = "description"; field public static final java.lang.String PROPERTY_DEVICE_UNIQUE_ID = "deviceUniqueId"; field public static final java.lang.String PROPERTY_VENDOR = "vendor"; diff --git a/media/java/android/media/MediaDrm.java b/media/java/android/media/MediaDrm.java index 31fbc4ab2dd0..db43ea2f632d 100644 --- a/media/java/android/media/MediaDrm.java +++ b/media/java/android/media/MediaDrm.java @@ -480,7 +480,7 @@ public final class MediaDrm { * supported by CryptoSession. The list may be empty if the DRM engine * plugin does not support CryptoSession operations. */ - public static final String PROPERTY_ALGORITHM = "algorithm"; + public static final String PROPERTY_ALGORITHMS = "algorithms"; /** * Read a DRM engine plugin String property value, given the property name string. @@ -493,8 +493,8 @@ public final class MediaDrm { /** - * The device unique identifier is established during device provisioning and - * provides a means of uniquely identifying each device + * Byte array property name: the device unique identifier is established during + * device provisioning and provides a means of uniquely identifying each device. */ public static final String PROPERTY_DEVICE_UNIQUE_ID = "deviceUniqueId"; |