commit a29ecc1a1ca4712d0adc40114e7af796af2feb04
author Jeff Tinker <jtinker@google.com> Fri Apr 14 00:18:41 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Apr 14 00:18:41 2017 +0000
tree 4907e7c9e71e23126c3e09a9c38a1e1537df70ca
parent 4f499a0a175e96320ae1828ea35816d9c9a6d8eb
parent 92fc8bdd518cccf1c4fe2c9ad2460178cf61e3b4

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

Change-Id: I14d1dae73008df0244c1435c1ab634d573208d50

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index f0f0441..b40a591 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -22342,7 +22342,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 003dc55..5e69322 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -24171,7 +24171,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 6fdbcc2..1383af9 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -22449,7 +22449,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;