commit 26a54ecaa556f72086790caa133e5a8d31652d8a
author Jeff Tinker <jtinker@google.com> Fri Apr 19 20:32:35 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 19 20:32:35 2013 +0000
tree 311be00c8f63281dd40a178d498a8362213c815f
parent ca2a6374aadb95ca3f151d4bc2fdd3127f04e5e7
parent f0d4777473f25847d67fc17fc082fada08cf678d

Merge "Correct algorithm property name and clarify javadoc description of device unique id property." into jb-mr2-dev

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index cd4b103..76e11ae 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -11845,7 +11845,7 @@
     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";

media/java/android/media/MediaDrm.java

diff --git a/media/java/android/media/MediaDrm.java b/media/java/android/media/MediaDrm.java
index 31fbc4a..db43ea2 100644
--- a/media/java/android/media/MediaDrm.java
+++ b/media/java/android/media/MediaDrm.java
@@ -480,7 +480,7 @@
      * 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 @@
 
 
     /**
-     * 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";