Merge "media: add annotations to low-level Media* classes" (ce510d5f) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -15733,7 +15733,7 @@ package android.media {
		method public final void release();
		method public void seekTo(long, int);
		method public void selectTrack(int);
		method public final void setDataSource(android.media.MediaDataSource) throws java.io.IOException, java.lang.IllegalArgumentException;
		method public final void setDataSource(android.media.MediaDataSource) throws java.io.IOException;
		method public final void setDataSource(android.content.Context, android.net.Uri, java.util.Map<java.lang.String, java.lang.String>) throws java.io.IOException;
		method public final void setDataSource(java.lang.String, java.util.Map<java.lang.String, java.lang.String>) throws java.io.IOException;
		method public final void setDataSource(java.lang.String) throws java.io.IOException;

api/system-current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -16946,7 +16946,7 @@ package android.media {
		method public final void release();
		method public void seekTo(long, int);
		method public void selectTrack(int);
		method public final void setDataSource(android.media.MediaDataSource) throws java.io.IOException, java.lang.IllegalArgumentException;
		method public final void setDataSource(android.media.MediaDataSource) throws java.io.IOException;
		method public final void setDataSource(android.content.Context, android.net.Uri, java.util.Map<java.lang.String, java.lang.String>) throws java.io.IOException;
		method public final void setDataSource(java.lang.String, java.util.Map<java.lang.String, java.lang.String>) throws java.io.IOException;
		method public final void setDataSource(java.lang.String) throws java.io.IOException;

media/java/android/media/MediaCodec.java

+154 −58

File changed.

Preview size limit exceeded, changes collapsed.

media/java/android/media/MediaCrypto.java

+9 −7

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		package android.media;

		import android.annotation.NonNull;
		import android.media.MediaCryptoException;
		import java.util.UUID;

		@@ -34,11 +35,12 @@ public final class MediaCrypto {
		* this device.
		* @param uuid The UUID of the crypto scheme.
		*/
		public static final boolean isCryptoSchemeSupported(UUID uuid) {
		public static final boolean isCryptoSchemeSupported(@NonNull UUID uuid) {
		return isCryptoSchemeSupportedNative(getByteArrayFromUUID(uuid));
		}

		private static final byte[] getByteArrayFromUUID(UUID uuid) {
		@NonNull
		private static final byte[] getByteArrayFromUUID(@NonNull UUID uuid) {
		long msb = uuid.getMostSignificantBits();
		long lsb = uuid.getLeastSignificantBits();

		@@ -51,7 +53,7 @@ public final class MediaCrypto {
		return uuidBytes;
		}

		private static final native boolean isCryptoSchemeSupportedNative(byte[] uuid);
		private static final native boolean isCryptoSchemeSupportedNative(@NonNull byte[] uuid);

		/**
		* Instantiate a MediaCrypto object using opaque, crypto scheme specific
		@@ -59,7 +61,7 @@ public final class MediaCrypto {
		* @param uuid The UUID of the crypto scheme.
		* @param initData Opaque initialization data specific to the crypto scheme.
		*/
		public MediaCrypto(UUID uuid, byte[] initData) throws MediaCryptoException {
		public MediaCrypto(@NonNull UUID uuid, @NonNull byte[] initData) throws MediaCryptoException {
		native_setup(getByteArrayFromUUID(uuid), initData);
		}

		@@ -68,7 +70,7 @@ public final class MediaCrypto {
		* to decode data of the given mime type.
		* @param mime The mime type of the media data
		*/
		public final native boolean requiresSecureDecoderComponent(String mime);
		public final native boolean requiresSecureDecoderComponent(@NonNull String mime);

		/**
		* Associate a MediaDrm session with this MediaCrypto instance. The
		@@ -81,7 +83,7 @@ public final class MediaCrypto {
		* MediaCrypto instance
		* @throws MediaCryptoException on failure to set the sessionId
		*/
		public final native void setMediaDrmSession(byte[] sessionId)
		public final native void setMediaDrmSession(@NonNull byte[] sessionId)
		throws MediaCryptoException;

		@Override
		@@ -92,7 +94,7 @@ public final class MediaCrypto {
		public native final void release();
		private static native final void native_init();

		private native final void native_setup(byte[] uuid, byte[] initData)
		private native final void native_setup(@NonNull byte[] uuid, @NonNull byte[] initData)
		throws MediaCryptoException;

		private native final void native_finalize();

media/java/android/media/MediaCryptoException.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -16,12 +16,14 @@

		package android.media;

		import android.annotation.Nullable;

		/**
		* Exception thrown if MediaCrypto object could not be instantiated or
		* if unable to perform an operation on the MediaCrypto object.
		*/
		public final class MediaCryptoException extends Exception {
		public MediaCryptoException(String detailMessage) {
		public MediaCryptoException(@Nullable String detailMessage) {
		super(detailMessage);
		}
		}