From 112b98b5789e8048833e29020ffadb5ce75fb48e Mon Sep 17 00:00:00 2001 From: Jeff Tinker Date: Wed, 5 Apr 2017 08:51:48 -0700 Subject: 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 | 2 +- api/system-current.txt | 2 +- api/test-current.txt | 2 +- media/java/android/media/MediaDrm.java | 3 +++ 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/api/current.txt b/api/current.txt index 7c532d4b8ffa..6f5c04e7fe7b 100644 --- a/api/current.txt +++ b/api/current.txt @@ -22359,7 +22359,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 diff --git a/api/system-current.txt b/api/system-current.txt index 99a579321c79..a8ea9e02a5e4 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -24184,7 +24184,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 diff --git a/api/test-current.txt b/api/test-current.txt index 570855fb0043..fb88f1b5ee42 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -22472,7 +22472,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 diff --git a/media/java/android/media/MediaDrm.java b/media/java/android/media/MediaDrm.java index b8d1d12b350e..88b1c5ffcc7e 100644 --- a/media/java/android/media/MediaDrm.java +++ b/media/java/android/media/MediaDrm.java @@ -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; -- cgit v1.2.3-59-g8ed1b