diff --git a/framework/api/current.txt b/framework/api/current.txt index a75523496b..c53f29a5ef 100644 --- a/framework/api/current.txt +++ b/framework/api/current.txt @@ -206,7 +206,6 @@ package android.net { } public final class IpPrefix implements android.os.Parcelable { - ctor public IpPrefix(@NonNull java.net.InetAddress, @IntRange(from=0, to=128) int); method public boolean contains(@NonNull java.net.InetAddress); method public int describeContents(); method @NonNull public java.net.InetAddress getAddress(); diff --git a/framework/api/system-current.txt b/framework/api/system-current.txt index 5337b3807c..7db8725582 100644 --- a/framework/api/system-current.txt +++ b/framework/api/system-current.txt @@ -131,6 +131,7 @@ package android.net { } public final class IpPrefix implements android.os.Parcelable { + ctor public IpPrefix(@NonNull java.net.InetAddress, @IntRange(from=0, to=128) int); ctor public IpPrefix(@NonNull String); } diff --git a/framework/src/android/net/IpPrefix.java b/framework/src/android/net/IpPrefix.java index c26a0b53bf..bf4481afc5 100644 --- a/framework/src/android/net/IpPrefix.java +++ b/framework/src/android/net/IpPrefix.java @@ -87,7 +87,9 @@ public final class IpPrefix implements Parcelable { * * @param address the IP address. Must be non-null. * @param prefixLength the prefix length. Must be >= 0 and <= (32 or 128) (IPv4 or IPv6). + * @hide */ + @SystemApi public IpPrefix(@NonNull InetAddress address, @IntRange(from = 0, to = 128) int prefixLength) { // We don't reuse the (byte[], int) constructor because it calls clone() on the byte array, // which is unnecessary because getAddress() already returns a clone. diff --git a/tests/common/java/android/net/IpPrefixTest.java b/tests/common/java/android/net/IpPrefixTest.java index f61c8c3583..50ecb42835 100644 --- a/tests/common/java/android/net/IpPrefixTest.java +++ b/tests/common/java/android/net/IpPrefixTest.java @@ -122,9 +122,6 @@ public class IpPrefixTest { p = new IpPrefix("[2001:db8::123]/64"); assertEquals("2001:db8::/64", p.toString()); - - p = new IpPrefix(InetAddresses.parseNumericAddress("::128"), 64); - assertEquals("::/64", p.toString()); } @Test