Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 408e6637 authored by Jeff Tinker's avatar Jeff Tinker Committed by Android Git Automerger
Browse files

am 26a54eca: Merge "Correct algorithm property name and clarify javadoc... 

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

* commit '26a54eca':
  Correct algorithm property name and clarify javadoc description of device unique id property.
parents 1b50e4ea 26a54eca

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -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";

media/java/android/media/MediaDrm.java

+3 −3
Original line number Diff line number Diff line
@@ -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";