Merge "Merge "Fix Automated API Review: InetAddresses" am: 4daca39083 am:... (1b96b76a) · Commits · e / os / android_frameworks_base

api/current.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -28756,8 +28756,8 @@ package android.net {
		}

		public class InetAddresses {
		method public static boolean isNumericAddress(String);
		method public static java.net.InetAddress parseNumericAddress(String);
		method public static boolean isNumericAddress(@NonNull String);
		method @NonNull public static java.net.InetAddress parseNumericAddress(@NonNull String);
		}

		public final class IpPrefix implements android.os.Parcelable {

+4 −2

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

		package android.net;

		import android.annotation.NonNull;

		import libcore.net.InetAddressUtils;

		import java.net.InetAddress;
		@@ -40,7 +42,7 @@ public class InetAddresses {
		* @param address the address to parse.
		* @return true if the supplied address is numeric, false otherwise.
		*/
		public static boolean isNumericAddress(String address) {
		public static boolean isNumericAddress(@NonNull String address) {
		return InetAddressUtils.isNumericAddress(address);
		}

		@@ -57,7 +59,7 @@ public class InetAddresses {
		* @return an {@link InetAddress} instance corresponding to the address.
		* @throws IllegalArgumentException if {@code address} is not a numeric address.
		*/
		public static InetAddress parseNumericAddress(String address) {
		public static @NonNull InetAddress parseNumericAddress(@NonNull String address) {
		return InetAddressUtils.parseNumericAddress(address);
		}
		}