Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '26a54ecaa556f72086790caa133e5a8d31652d8a':
  Correct algorithm property name and clarify javadoc description of device unique id property.
This commit is contained in:
Jeff Tinker
2013-04-19 13:35:40 -07:00
committed by Android Git Automerger
parent 1b50e4ead5 26a54ecaa5
commit 408e663712
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -11845,7 +11845,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";

6
media/java/android/media/MediaDrm.java
View File

@@ -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";