Merge "Java doc fix: @throw -> @throws" (33793f62) · Commits · e / os / android_frameworks_base

media/java/android/media/MediaFormat.java

+25 −22

Original line number	Diff line number	Diff line
		@@ -1049,7 +1049,7 @@ public final class MediaFormat {
		* KEY_I_FRAME_INTERVAL}.
		*
		* @return null if the key does not exist or the stored value for the key is null
		* @throw ClassCastException if the stored value for the key is ByteBuffer or String
		* @throws ClassCastException if the stored value for the key is ByteBuffer or String
		*/
		public final @Nullable Number getNumber(@NonNull String name) {
		return ((Number)mMap.get(name));
		@@ -1059,7 +1059,7 @@ public final class MediaFormat {
		* Returns the value of a numeric key, or the default value if the key is missing.
		*
		* @return defaultValue if the key does not exist or the stored value for the key is null
		* @throw ClassCastException if the stored value for the key is ByteBuffer or String
		* @throws ClassCastException if the stored value for the key is ByteBuffer or String
		*/
		public final @NonNull Number getNumber(@NonNull String name, @NonNull Number defaultValue) {
		Number ret = getNumber(name);
		@@ -1069,8 +1069,9 @@ public final class MediaFormat {
		/**
		* Returns the value of an integer key.
		*
		* @throw NullPointerException if the key does not exist or the stored value for the key is null
		* @throw ClassCastException if the stored value for the key is long, float, ByteBuffer or
		* @throws NullPointerException if the key does not exist or the stored value for the key is
		* null
		* @throws ClassCastException if the stored value for the key is long, float, ByteBuffer or
		* String
		*/
		public final int getInteger(@NonNull String name) {
		@@ -1081,7 +1082,7 @@ public final class MediaFormat {
		* Returns the value of an integer key, or the default value if the key is missing.
		*
		* @return defaultValue if the key does not exist or the stored value for the key is null
		* @throw ClassCastException if the stored value for the key is long, float, ByteBuffer or
		* @throws ClassCastException if the stored value for the key is long, float, ByteBuffer or
		* String
		*/
		public final int getInteger(@NonNull String name, int defaultValue) {
		@@ -1096,8 +1097,9 @@ public final class MediaFormat {
		/**
		* Returns the value of a long key.
		*
		* @throw NullPointerException if the key does not exist or the stored value for the key is null
		* @throw ClassCastException if the stored value for the key is int, float, ByteBuffer or
		* @throws NullPointerException if the key does not exist or the stored value for the key is
		* null
		* @throws ClassCastException if the stored value for the key is int, float, ByteBuffer or
		* String
		*/
		public final long getLong(@NonNull String name) {
		@@ -1108,7 +1110,7 @@ public final class MediaFormat {
		* Returns the value of an long key, or the default value if the key is missing.
		*
		* @return defaultValue if the key does not exist or the stored value for the key is null
		* @throw ClassCastException if the stored value for the key is int, float, ByteBuffer or
		* @throws ClassCastException if the stored value for the key is int, float, ByteBuffer or
		* String
		*/
		public final long getLong(@NonNull String name, long defaultValue) {
		@@ -1123,8 +1125,9 @@ public final class MediaFormat {
		/**
		* Returns the value of a float key.
		*
		* @throw NullPointerException if the key does not exist or the stored value for the key is null
		* @throw ClassCastException if the stored value for the key is int, long, ByteBuffer or
		* @throws NullPointerException if the key does not exist or the stored value for the key is
		* null
		* @throws ClassCastException if the stored value for the key is int, long, ByteBuffer or
		* String
		*/
		public final float getFloat(@NonNull String name) {
		@@ -1135,7 +1138,7 @@ public final class MediaFormat {
		* Returns the value of an float key, or the default value if the key is missing.
		*
		* @return defaultValue if the key does not exist or the stored value for the key is null
		* @throw ClassCastException if the stored value for the key is int, long, ByteBuffer or
		* @throws ClassCastException if the stored value for the key is int, long, ByteBuffer or
		* String
		*/
		public final float getFloat(@NonNull String name, float defaultValue) {
		@@ -1151,7 +1154,7 @@ public final class MediaFormat {
		* Returns the value of a string key.
		*
		* @return null if the key does not exist or the stored value for the key is null
		* @throw ClassCastException if the stored value for the key is int, long, float or ByteBuffer
		* @throws ClassCastException if the stored value for the key is int, long, float or ByteBuffer
		*/
		public final @Nullable String getString(@NonNull String name) {
		return (String)mMap.get(name);
		@@ -1161,7 +1164,7 @@ public final class MediaFormat {
		* Returns the value of an string key, or the default value if the key is missing.
		*
		* @return defaultValue if the key does not exist or the stored value for the key is null
		* @throw ClassCastException if the stored value for the key is int, long, float or ByteBuffer
		* @throws ClassCastException if the stored value for the key is int, long, float or ByteBuffer
		*/
		public final @NonNull String getString(@NonNull String name, @NonNull String defaultValue) {
		String ret = getString(name);
		@@ -1172,7 +1175,7 @@ public final class MediaFormat {
		* Returns the value of a ByteBuffer key.
		*
		* @return null if the key does not exist or the stored value for the key is null
		* @throw ClassCastException if the stored value for the key is int, long, float or String
		* @throws ClassCastException if the stored value for the key is int, long, float or String
		*/
		public final @Nullable ByteBuffer getByteBuffer(@NonNull String name) {
		return (ByteBuffer)mMap.get(name);
		@@ -1182,7 +1185,7 @@ public final class MediaFormat {
		* Returns the value of a ByteBuffer key, or the default value if the key is missing.
		*
		* @return defaultValue if the key does not exist or the stored value for the key is null
		* @throw ClassCastException if the stored value for the key is int, long, float or String
		* @throws ClassCastException if the stored value for the key is int, long, float or String
		*/
		public final @NonNull ByteBuffer getByteBuffer(
		@NonNull String name, @NonNull ByteBuffer defaultValue) {

services/core/java/com/android/server/hdmi/HdmiControlService.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -980,7 +980,7 @@ public class HdmiControlService extends SystemService {
		* @param sourceAddress a logical address of source device where sends polling message
		* @param pickStrategy strategy how to pick polling candidates
		* @param retryCount the number of retry used to send polling message to remote devices
		* @throw IllegalArgumentException if {@code pickStrategy} is invalid value
		* @throws IllegalArgumentException if {@code pickStrategy} is invalid value
		*/
		@ServiceThreadOnly
		void pollDevices(DevicePollingCallback callback, int sourceAddress, int pickStrategy,