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

Commit 5f1be4be authored by Jeff Tinker's avatar Jeff Tinker Committed by Android (Google) Code Review
Browse files

Merge "Deprecate redundant event, should handle via NotProvisionedException"

parents 9ad4c443 7c8d999f

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -15145,7 +15145,7 @@ package android.media { 
    method public void setPropertyString(java.lang.String, java.lang.String);

    field public static final int EVENT_KEY_EXPIRED = 3; // 0x3

    field public static final int EVENT_KEY_REQUIRED = 2; // 0x2

    field public static final int EVENT_PROVISION_REQUIRED = 1; // 0x1

    field public static final deprecated int EVENT_PROVISION_REQUIRED = 1; // 0x1

    field public static final int EVENT_SESSION_RECLAIMED = 5; // 0x5

    field public static final int EVENT_VENDOR_DEFINED = 4; // 0x4

    field public static final int KEY_TYPE_OFFLINE = 2; // 0x2

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -16334,7 +16334,7 @@ package android.media { 
    method public void unprovisionDevice();

    field public static final int EVENT_KEY_EXPIRED = 3; // 0x3

    field public static final int EVENT_KEY_REQUIRED = 2; // 0x2

    field public static final int EVENT_PROVISION_REQUIRED = 1; // 0x1

    field public static final deprecated int EVENT_PROVISION_REQUIRED = 1; // 0x1

    field public static final int EVENT_SESSION_RECLAIMED = 5; // 0x5

    field public static final int EVENT_VENDOR_DEFINED = 4; // 0x4

    field public static final int KEY_TYPE_OFFLINE = 2; // 0x2

media/java/android/media/MediaDrm.java

+3 −0
Original line number Diff line number Diff line
@@ -254,6 +254,9 @@ public final class MediaDrm { 
     * This event type indicates that the app needs to request a certificate from

     * the provisioning server.  The request message data is obtained using

     * {@link #getProvisionRequest}

     *

     * @deprecated Handle provisioning via {@link android.media.NotProvisionedException}

     * instead.

     */

    public static final int EVENT_PROVISION_REQUIRED = 1;