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

Commit 7c8d999f authored by Jeff Tinker's avatar Jeff Tinker
Browse files

Deprecate redundant event, should handle via NotProvisionedException 

bug: 12033385
Change-Id: I02103f3fd9f48f57113bb248891fc1c8f0d8a248
parent 33dd7a46

api/current.txt

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