Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Give apps access to the NAT64 prefix." am: ce149dba87

Browse Source 
am: 7dfd758583

Change-Id: I251c5ac17fb728d6f0fe91fd96c115c8b8d1879c
This commit is contained in:
Chalard Jean
2019-12-01 18:27:36 -08:00
committed by android-build-merger
parent 01cb83a51a 7dfd758583
commit 36abe134c0
4 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -28696,6 +28696,7 @@ package android.net {
method @Nullable public String getInterfaceName(); method @Nullable public String getInterfaceName();
method @NonNull public java.util.List<android.net.LinkAddress> getLinkAddresses(); method @NonNull public java.util.List<android.net.LinkAddress> getLinkAddresses();
method public int getMtu(); method public int getMtu();
method @Nullable public android.net.IpPrefix getNat64Prefix();
method @Nullable public String getPrivateDnsServerName(); method @Nullable public String getPrivateDnsServerName();
method @NonNull public java.util.List<android.net.RouteInfo> getRoutes(); method @NonNull public java.util.List<android.net.RouteInfo> getRoutes();
method public boolean isPrivateDnsActive(); method public boolean isPrivateDnsActive();
@@ -28706,6 +28707,7 @@ package android.net {
method public void setInterfaceName(@Nullable String); method public void setInterfaceName(@Nullable String);
method public void setLinkAddresses(@NonNull java.util.Collection<android.net.LinkAddress>); method public void setLinkAddresses(@NonNull java.util.Collection<android.net.LinkAddress>);
method public void setMtu(int); method public void setMtu(int);
method public void setNat64Prefix(@Nullable android.net.IpPrefix);
method public void writeToParcel(android.os.Parcel, int); method public void writeToParcel(android.os.Parcel, int);
field @NonNull public static final android.os.Parcelable.Creator<android.net.LinkProperties> CREATOR; field @NonNull public static final android.os.Parcelable.Creator<android.net.LinkProperties> CREATOR;
} }

2
api/system-current.txt
View File

@@ -4150,7 +4150,6 @@ package android.net {
ctor public LinkProperties(@Nullable android.net.LinkProperties); ctor public LinkProperties(@Nullable android.net.LinkProperties);
method public boolean addDnsServer(@NonNull java.net.InetAddress); method public boolean addDnsServer(@NonNull java.net.InetAddress);
method public boolean addLinkAddress(@NonNull android.net.LinkAddress); 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 @NonNull public java.util.List<java.net.InetAddress> getPcscfServers();
method @Nullable public String getTcpBufferSizes(); method @Nullable public String getTcpBufferSizes();
method @NonNull public java.util.List<java.net.InetAddress> getValidatedPrivateDnsServers(); 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 removeDnsServer(@NonNull java.net.InetAddress);
method public boolean removeLinkAddress(@NonNull android.net.LinkAddress); method public boolean removeLinkAddress(@NonNull android.net.LinkAddress);
method public boolean removeRoute(@NonNull android.net.RouteInfo); 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 setPcscfServers(@NonNull java.util.Collection<java.net.InetAddress>);
method public void setPrivateDnsServerName(@Nullable String); method public void setPrivateDnsServerName(@Nullable String);
method public void setTcpBufferSizes(@Nullable String); method public void setTcpBufferSizes(@Nullable String);

2
api/test-current.txt
View File

@@ -1384,7 +1384,6 @@ package android.net {
ctor public LinkProperties(@Nullable android.net.LinkProperties); ctor public LinkProperties(@Nullable android.net.LinkProperties);
method public boolean addDnsServer(@NonNull java.net.InetAddress); method public boolean addDnsServer(@NonNull java.net.InetAddress);
method public boolean addLinkAddress(@NonNull android.net.LinkAddress); 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 @NonNull public java.util.List<java.net.InetAddress> getPcscfServers();
method @Nullable public String getTcpBufferSizes(); method @Nullable public String getTcpBufferSizes();
method @NonNull public java.util.List<java.net.InetAddress> getValidatedPrivateDnsServers(); 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 removeDnsServer(@NonNull java.net.InetAddress);
method public boolean removeLinkAddress(@NonNull android.net.LinkAddress); method public boolean removeLinkAddress(@NonNull android.net.LinkAddress);
method public boolean removeRoute(@NonNull android.net.RouteInfo); 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 setPcscfServers(@NonNull java.util.Collection<java.net.InetAddress>);
method public void setPrivateDnsServerName(@Nullable String); method public void setPrivateDnsServerName(@Nullable String);
method public void setTcpBufferSizes(@Nullable String); method public void setTcpBufferSizes(@Nullable String);

6
core/java/android/net/LinkProperties.java
View File

@@ -762,10 +762,7 @@ public final class LinkProperties implements Parcelable {
* Returns the NAT64 prefix in use on this link, if any. * Returns the NAT64 prefix in use on this link, if any.
* *
* @return the NAT64 prefix or {@code null}. * @return the NAT64 prefix or {@code null}.
* @hide
*/ */
@SystemApi
@TestApi
public @Nullable IpPrefix getNat64Prefix() { public @Nullable IpPrefix getNat64Prefix() {
return mNat64Prefix; return mNat64Prefix;
} }
@@ -777,10 +774,7 @@ public final class LinkProperties implements Parcelable {
* 128-bit IPv6 address) are supported or {@code null} for no prefix. * 128-bit IPv6 address) are supported or {@code null} for no prefix.
* *
* @param prefix the NAT64 prefix. * @param prefix the NAT64 prefix.
* @hide
*/ */
@SystemApi
@TestApi
public void setNat64Prefix(@Nullable IpPrefix prefix) { public void setNat64Prefix(@Nullable IpPrefix prefix) {
if (prefix != null && prefix.getPrefixLength() != 96) { if (prefix != null && prefix.getPrefixLength() != 96) {
throw new IllegalArgumentException("Only 96-bit prefixes are supported: " + prefix); throw new IllegalArgumentException("Only 96-bit prefixes are supported: " + prefix);