diff options
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | api/system-current.txt | 2 | ||||
| -rw-r--r-- | api/test-current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/net/LinkProperties.java | 6 |
4 files changed, 2 insertions, 10 deletions
diff --git a/api/current.txt b/api/current.txt index d344c2bf4a72..ab0c57dfaaf2 100644 --- a/api/current.txt +++ b/api/current.txt @@ -28696,6 +28696,7 @@ package android.net { method @Nullable public String getInterfaceName(); method @NonNull public java.util.List<android.net.LinkAddress> getLinkAddresses(); method public int getMtu(); + method @Nullable public android.net.IpPrefix getNat64Prefix(); method @Nullable public String getPrivateDnsServerName(); method @NonNull public java.util.List<android.net.RouteInfo> getRoutes(); method public boolean isPrivateDnsActive(); @@ -28706,6 +28707,7 @@ package android.net { method public void setInterfaceName(@Nullable String); method public void setLinkAddresses(@NonNull java.util.Collection<android.net.LinkAddress>); method public void setMtu(int); + method public void setNat64Prefix(@Nullable android.net.IpPrefix); method public void writeToParcel(android.os.Parcel, int); field @NonNull public static final android.os.Parcelable.Creator<android.net.LinkProperties> CREATOR; } diff --git a/api/system-current.txt b/api/system-current.txt index 492354ae661a..756b4f1d0351 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -4150,7 +4150,6 @@ package android.net { ctor public LinkProperties(@Nullable android.net.LinkProperties); method public boolean addDnsServer(@NonNull java.net.InetAddress); method public boolean addLinkAddress(@NonNull android.net.LinkAddress); - method @Nullable public android.net.IpPrefix getNat64Prefix(); method @NonNull public java.util.List<java.net.InetAddress> getPcscfServers(); method @Nullable public String getTcpBufferSizes(); method @NonNull public java.util.List<java.net.InetAddress> getValidatedPrivateDnsServers(); @@ -4164,7 +4163,6 @@ package android.net { method public boolean removeDnsServer(@NonNull java.net.InetAddress); method public boolean removeLinkAddress(@NonNull android.net.LinkAddress); method public boolean removeRoute(@NonNull android.net.RouteInfo); - method public void setNat64Prefix(@Nullable android.net.IpPrefix); method public void setPcscfServers(@NonNull java.util.Collection<java.net.InetAddress>); method public void setPrivateDnsServerName(@Nullable String); method public void setTcpBufferSizes(@Nullable String); diff --git a/api/test-current.txt b/api/test-current.txt index 1fe4274460b2..179f3b8f14e4 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -1384,7 +1384,6 @@ package android.net { ctor public LinkProperties(@Nullable android.net.LinkProperties); method public boolean addDnsServer(@NonNull java.net.InetAddress); method public boolean addLinkAddress(@NonNull android.net.LinkAddress); - method @Nullable public android.net.IpPrefix getNat64Prefix(); method @NonNull public java.util.List<java.net.InetAddress> getPcscfServers(); method @Nullable public String getTcpBufferSizes(); method @NonNull public java.util.List<java.net.InetAddress> getValidatedPrivateDnsServers(); @@ -1398,7 +1397,6 @@ package android.net { method public boolean removeDnsServer(@NonNull java.net.InetAddress); method public boolean removeLinkAddress(@NonNull android.net.LinkAddress); method public boolean removeRoute(@NonNull android.net.RouteInfo); - method public void setNat64Prefix(@Nullable android.net.IpPrefix); method public void setPcscfServers(@NonNull java.util.Collection<java.net.InetAddress>); method public void setPrivateDnsServerName(@Nullable String); method public void setTcpBufferSizes(@Nullable String); diff --git a/core/java/android/net/LinkProperties.java b/core/java/android/net/LinkProperties.java index 0706e755d133..8e1834113486 100644 --- a/core/java/android/net/LinkProperties.java +++ b/core/java/android/net/LinkProperties.java @@ -762,10 +762,7 @@ public final class LinkProperties implements Parcelable { * Returns the NAT64 prefix in use on this link, if any. * * @return the NAT64 prefix or {@code null}. - * @hide */ - @SystemApi - @TestApi public @Nullable IpPrefix getNat64Prefix() { return mNat64Prefix; } @@ -777,10 +774,7 @@ public final class LinkProperties implements Parcelable { * 128-bit IPv6 address) are supported or {@code null} for no prefix. * * @param prefix the NAT64 prefix. - * @hide */ - @SystemApi - @TestApi public void setNat64Prefix(@Nullable IpPrefix prefix) { if (prefix != null && prefix.getPrefixLength() != 96) { throw new IllegalArgumentException("Only 96-bit prefixes are supported: " + prefix); |