diff options
| -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"; |