commit 112b98b5789e8048833e29020ffadb5ce75fb48e
author Jeff Tinker <jtinker@google.com> Wed Apr 05 08:51:48 2017 -0700
committer Jeff Tinker <jtinker@google.com> Wed Apr 12 17:26:57 2017 -0700
tree 5c6226077130a24383c236d78078695e3a028a08
parent 068b429c340e9aa5935a76cff5eb52f8068f2f1c

Deprecate MediaDrm's EVENT_KEY_EXPIRED method

It has been replaced by onKeyStatusChange

Test: make offline-sdk-docs

bug: 21661111
Change-Id: I18e6604e9d3db7fb05209ad053b07546e7dd2bbd

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 7c532d4..6f5c04e 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -22359,7 +22359,7 @@
     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

diff --git a/api/system-current.txt b/api/system-current.txt
index 99a5793..a8ea9e0 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -24184,7 +24184,7 @@
     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

diff --git a/api/test-current.txt b/api/test-current.txt
index 570855f..fb88f1b 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -22472,7 +22472,7 @@
     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

diff --git a/media/java/android/media/MediaDrm.java b/media/java/android/media/MediaDrm.java
index b8d1d12..88b1c5f 100644
--- a/media/java/android/media/MediaDrm.java
+++ b/media/java/android/media/MediaDrm.java
@@ -474,6 +474,9 @@
     /**
      * 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;