Merge "Add status for license starting in the future" (3330585f) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -24851,6 +24851,7 @@ package android.media {
		field public static final int STATUS_OUTPUT_NOT_ALLOWED = 2; // 0x2
		field public static final int STATUS_PENDING = 3; // 0x3
		field public static final int STATUS_USABLE = 0; // 0x0
		field public static final int STATUS_USABLE_IN_FUTURE = 5; // 0x5
		}

		public static final class MediaDrm.MediaDrmStateException extends java.lang.IllegalStateException {

+8 −0

Original line number	Diff line number	Diff line
		@@ -552,6 +552,13 @@ public final class MediaDrm implements AutoCloseable {
		*/
		public static final int STATUS_INTERNAL_ERROR = 4;

		/**
		* The key is not yet usable to decrypt media because the start
		* time is in the future. The key will become usable when
		* its start time is reached.
		*/
		public static final int STATUS_USABLE_IN_FUTURE = 5;

		/** @hide */
		@IntDef({
		STATUS_USABLE,
		@@ -559,6 +566,7 @@ public final class MediaDrm implements AutoCloseable {
		STATUS_OUTPUT_NOT_ALLOWED,
		STATUS_PENDING,
		STATUS_INTERNAL_ERROR,
		STATUS_USABLE_IN_FUTURE,
		})
		@Retention(RetentionPolicy.SOURCE)
		public @interface KeyStatusCode {}