Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 94a05573 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN
Browse files

Add LinkProps and NetworkCaps methods to SystemApi 

Added methods are used by the NetworkStack.

Test: atest FrameworksNetTests NetworkStackTests
Bug: 112869080
Change-Id: I8822d43c1a4981ca39289525685b3f975fb0e8d5
parent 8586a43f

api/system-current.txt

+18 −0
Original line number Diff line number Diff line
@@ -3061,14 +3061,30 @@ package android.net { 


  public final class LinkProperties implements android.os.Parcelable {

    ctor public LinkProperties();

    method public boolean addDnsServer(java.net.InetAddress);

    method public boolean addRoute(android.net.RouteInfo);

    method public void clear();

    method public String getTcpBufferSizes();

    method public java.util.List<java.net.InetAddress> getValidatedPrivateDnsServers();

    method public boolean hasGlobalIPv6Address();

    method public boolean hasIPv4Address();

    method public boolean hasIPv6DefaultRoute();

    method public boolean isIPv4Provisioned();

    method public boolean isIPv6Provisioned();

    method public boolean isProvisioned();

    method public boolean isReachable(java.net.InetAddress);

    method public boolean removeDnsServer(java.net.InetAddress);

    method public boolean removeRoute(android.net.RouteInfo);

    method public void setDnsServers(java.util.Collection<java.net.InetAddress>);

    method public void setDomains(String);

    method public void setHttpProxy(android.net.ProxyInfo);

    method public void setInterfaceName(String);

    method public void setLinkAddresses(java.util.Collection<android.net.LinkAddress>);

    method public void setMtu(int);

    method public void setPrivateDnsServerName(@Nullable String);

    method public void setTcpBufferSizes(String);

    method public void setUsePrivateDns(boolean);

    method public void setValidatedPrivateDnsServers(java.util.Collection<java.net.InetAddress>);

  }



  public class Network implements android.os.Parcelable {
@@ -3077,6 +3093,8 @@ package android.net { 


  public final class NetworkCapabilities implements android.os.Parcelable {

    method public int getSignalStrength();

    method public int[] getTransportTypes();

    method public boolean satisfiedByNetworkCapabilities(android.net.NetworkCapabilities);

    field public static final int NET_CAPABILITY_OEM_PAID = 22; // 0x16

  }

api/test-current.txt

+20 −0
Original line number Diff line number Diff line
@@ -620,6 +620,25 @@ package android.net { 
    method public boolean isSameAddressAs(android.net.LinkAddress);

  }



  public final class LinkProperties implements android.os.Parcelable {

    method public boolean addDnsServer(java.net.InetAddress);

    method public String getTcpBufferSizes();

    method public java.util.List<java.net.InetAddress> getValidatedPrivateDnsServers();

    method public boolean hasGlobalIPv6Address();

    method public boolean hasIPv4Address();

    method public boolean hasIPv6DefaultRoute();

    method public boolean isIPv4Provisioned();

    method public boolean isIPv6Provisioned();

    method public boolean isProvisioned();

    method public boolean isReachable(java.net.InetAddress);

    method public boolean removeDnsServer(java.net.InetAddress);

    method public boolean removeRoute(android.net.RouteInfo);

    method public void setPrivateDnsServerName(@Nullable String);

    method public void setTcpBufferSizes(String);

    method public void setUsePrivateDns(boolean);

    method public void setValidatedPrivateDnsServers(java.util.Collection<java.net.InetAddress>);

  }



  public class Network implements android.os.Parcelable {

    method public android.net.Network getPrivateDnsBypassingCopy();

  }
@@ -627,6 +646,7 @@ package android.net { 
  public final class NetworkCapabilities implements android.os.Parcelable {

    method public int[] getCapabilities();

    method public int[] getTransportTypes();

    method public boolean satisfiedByNetworkCapabilities(android.net.NetworkCapabilities);

  }



  public final class RouteInfo implements android.os.Parcelable {

core/java/android/net/LinkProperties.java

+33 −11
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package android.net; 
import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.SystemApi;

import android.annotation.TestApi;

import android.annotation.UnsupportedAppUsage;

import android.os.Build;

import android.os.Parcel;
@@ -368,7 +369,8 @@ public final class LinkProperties implements Parcelable { 
     * @return true if the DNS server was added, false if it was already present.

     * @hide

     */

    @UnsupportedAppUsage

    @TestApi

    @SystemApi

    public boolean addDnsServer(InetAddress dnsServer) {

        if (dnsServer != null && !mDnses.contains(dnsServer)) {

            mDnses.add(dnsServer);
@@ -384,7 +386,8 @@ public final class LinkProperties implements Parcelable { 
     * @return true if the DNS server was removed, false if it did not exist.

     * @hide

     */

    @UnsupportedAppUsage

    @TestApi

    @SystemApi

    public boolean removeDnsServer(InetAddress dnsServer) {

        if (dnsServer != null) {

            return mDnses.remove(dnsServer);
@@ -423,6 +426,8 @@ public final class LinkProperties implements Parcelable { 
     * @param usePrivateDns The private DNS state.

     * @hide

     */

    @TestApi

    @SystemApi

    public void setUsePrivateDns(boolean usePrivateDns) {

        mUsePrivateDns = usePrivateDns;

    }
@@ -448,6 +453,8 @@ public final class LinkProperties implements Parcelable { 
     * @param privateDnsServerName The private DNS server name.

     * @hide

     */

    @TestApi

    @SystemApi

    public void setPrivateDnsServerName(@Nullable String privateDnsServerName) {

        mPrivateDnsServerName = privateDnsServerName;

    }
@@ -510,6 +517,8 @@ public final class LinkProperties implements Parcelable { 
     *        object.

     * @hide

     */

    @TestApi

    @SystemApi

    public void setValidatedPrivateDnsServers(Collection<InetAddress> dnsServers) {

        mValidatedPrivateDnses.clear();

        for (InetAddress dnsServer: dnsServers) {
@@ -525,6 +534,8 @@ public final class LinkProperties implements Parcelable { 
     *         DNS servers on this link.

     * @hide

     */

    @TestApi

    @SystemApi

    public List<InetAddress> getValidatedPrivateDnsServers() {

        return Collections.unmodifiableList(mValidatedPrivateDnses);

    }
@@ -636,7 +647,8 @@ public final class LinkProperties implements Parcelable { 
     *

     * @hide

     */

    @UnsupportedAppUsage

    @TestApi

    @SystemApi

    public void setTcpBufferSizes(String tcpBufferSizes) {

        mTcpBufferSizes = tcpBufferSizes;

    }
@@ -648,7 +660,8 @@ public final class LinkProperties implements Parcelable { 
     *

     * @hide

     */

    @UnsupportedAppUsage

    @TestApi

    @SystemApi

    public String getTcpBufferSizes() {

        return mTcpBufferSizes;

    }
@@ -699,7 +712,8 @@ public final class LinkProperties implements Parcelable { 
     *

     * @hide

     */

    @UnsupportedAppUsage

    @TestApi

    @SystemApi

    public boolean removeRoute(RouteInfo route) {

        return route != null &&

                Objects.equals(mIfaceName, route.getInterface()) &&
@@ -960,7 +974,8 @@ public final class LinkProperties implements Parcelable { 
     * @return {@code true} if there is an IPv4 address, {@code false} otherwise.

     * @hide

     */

    @UnsupportedAppUsage

    @TestApi

    @SystemApi

    public boolean hasIPv4Address() {

        for (LinkAddress address : mLinkAddresses) {

            if (address.getAddress() instanceof Inet4Address) {
@@ -988,7 +1003,8 @@ public final class LinkProperties implements Parcelable { 
     * @return {@code true} if there is a global preferred IPv6 address, {@code false} otherwise.

     * @hide

     */

    @UnsupportedAppUsage

    @TestApi

    @SystemApi

    public boolean hasGlobalIPv6Address() {

        for (LinkAddress address : mLinkAddresses) {

          if (address.getAddress() instanceof Inet6Address && address.isGlobalPreferred()) {
@@ -1020,7 +1036,8 @@ public final class LinkProperties implements Parcelable { 
     * @return {@code true} if there is an IPv6 default route, {@code false} otherwise.

     * @hide

     */

    @UnsupportedAppUsage

    @TestApi

    @SystemApi

    public boolean hasIPv6DefaultRoute() {

        for (RouteInfo r : mRoutes) {

            if (r.isIPv6Default()) {
@@ -1099,6 +1116,8 @@ public final class LinkProperties implements Parcelable { 
     * @return {@code true} if the link is provisioned, {@code false} otherwise.

     * @hide

     */

    @TestApi

    @SystemApi

    public boolean isIPv4Provisioned() {

        return (hasIPv4Address() &&

                hasIPv4DefaultRoute() &&
@@ -1112,7 +1131,8 @@ public final class LinkProperties implements Parcelable { 
     * @return {@code true} if the link is provisioned, {@code false} otherwise.

     * @hide

     */

    @UnsupportedAppUsage

    @TestApi

    @SystemApi

    public boolean isIPv6Provisioned() {

        return (hasGlobalIPv6Address() &&

                hasIPv6DefaultRoute() &&
@@ -1126,7 +1146,8 @@ public final class LinkProperties implements Parcelable { 
     * @return {@code true} if the link is provisioned, {@code false} otherwise.

     * @hide

     */

    @UnsupportedAppUsage

    @TestApi

    @SystemApi

    public boolean isProvisioned() {

        return (isIPv4Provisioned() || isIPv6Provisioned());

    }
@@ -1138,7 +1159,8 @@ public final class LinkProperties implements Parcelable { 
     *         {@code false} otherwise.

     * @hide

     */

    @UnsupportedAppUsage

    @TestApi

    @SystemApi

    public boolean isReachable(InetAddress ip) {

        final List<RouteInfo> allRoutes = getAllRoutes();

        // If we don't have a route to this IP address, it's not reachable.

core/java/android/net/LinkPropertiesParcelable.aidl

+0 −1
Original line number Diff line number Diff line
@@ -35,5 +35,4 @@ parcelable LinkPropertiesParcelable { 
    int mtu;

    String tcpBufferSizes;

    IpPrefixParcelable nat64Prefix;

    LinkPropertiesParcelable[] stackedLinks;

}
 
 No newline at end of file

core/java/android/net/NetworkCapabilities.java

+3 −0
Original line number Diff line number Diff line
@@ -712,6 +712,7 @@ public final class NetworkCapabilities implements Parcelable { 
     * @hide

     */

    @TestApi

    @SystemApi

    public @Transport int[] getTransportTypes() {

        return BitUtils.unpackBits(mTransportTypes);

    }
@@ -1312,6 +1313,8 @@ public final class NetworkCapabilities implements Parcelable { 
     *

     * @hide

     */

    @TestApi

    @SystemApi

    public boolean satisfiedByNetworkCapabilities(NetworkCapabilities nc) {

        return satisfiedByNetworkCapabilities(nc, false);

    }