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

Commit 835a765a authored by Jeff Tinker's avatar Jeff Tinker Committed by android-build-merger
Browse files

Merge "Deprecate MediaDrm's EVENT_KEY_EXPIRED method" into oc-dev am: 92fc8bdd 

am: a29ecc1a

Change-Id: I6cb7def4e72bb154227cba3b50ea09ec7f6b5003
parents cc6759b1 a29ecc1a

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -22346,7 +22346,7 @@ package android.media { 
    method public void setOnKeyStatusChangeListener(android.media.MediaDrm.OnKeyStatusChangeListener, android.os.Handler);

    method public void setPropertyByteArray(java.lang.String, byte[]);

    method public void setPropertyString(java.lang.String, java.lang.String);

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

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

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

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

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

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -24177,7 +24177,7 @@ package android.media { 
    method public void setOnKeyStatusChangeListener(android.media.MediaDrm.OnKeyStatusChangeListener, android.os.Handler);

    method public void setPropertyByteArray(java.lang.String, byte[]);

    method public void setPropertyString(java.lang.String, java.lang.String);

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

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

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

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

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

api/test-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -22453,7 +22453,7 @@ package android.media { 
    method public void setOnKeyStatusChangeListener(android.media.MediaDrm.OnKeyStatusChangeListener, android.os.Handler);

    method public void setPropertyByteArray(java.lang.String, byte[]);

    method public void setPropertyString(java.lang.String, java.lang.String);

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

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

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

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

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

media/java/android/media/MediaDrm.java

+3 −0
Original line number Diff line number Diff line
@@ -474,6 +474,9 @@ public final class MediaDrm { 
    /**

     * This event type indicates that the licensed usage duration for keys in a session

     * has expired.  The keys are no longer valid.

     * @deprecated Use {@link OnKeyStatusChangeListener#onKeyStatusChange}

     * and check for {@link MediaDrm.KeyStatus#STATUS_EXPIRED} in the {@link MediaDrm.KeyStatus}

     * instead.

     */

    public static final int EVENT_KEY_EXPIRED = 3;