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

Commit f4e3fdcd authored by Ayush Sharma's avatar Ayush Sharma
Browse files

Revert "Suppress NewApi warnings for @SystemApi -> public APIs" 

Revert submission 1551943-vpn-impl

Reason for revert: <DroidMonitor-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=aosp-master&target=mainline_modules_x86_64-userdebug&lkgb=8007224&lkbb=8008168&fkbb=8007902 >, bug b/210979001
Reverted Changes:
I0e7aa077a:Add VpnServiceBuilderShim for VpnService.Builder
Ib12f5ab39:Suppress NewApi warnings for @SystemApi -> public ...
I59b9185cf:Unhide RouteInfo#getType and related fields
Ie5b62b2b2:Unhide IpPrefix(InetAddress, int)
I993a32d40:Add CTS tests for exclude VPN routes APIs
Ib24b2d3fb:Suppress NewApi warnings for @SystemApi -> public ...
Ic3b10464a:Add APIs that allow to exclude routes from VPN

Change-Id: Ib3512eb9ab9d711fd88d16ecc617531626f49ea0
BUG: 210979001
parent ed82da06

src/android/net/dhcp/DhcpServingParams.java

+0 −2
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ import static com.android.net.module.util.NetworkStackConstants.IPV4_MIN_MTU; 


import static java.lang.Integer.toUnsignedLong;



import android.annotation.SuppressLint;

import android.net.IpPrefix;

import android.net.LinkAddress;

import android.util.ArraySet;
@@ -412,7 +411,6 @@ public class DhcpServingParams { 
    /**

     * Utility method to create an IpPrefix with the address and prefix length of a LinkAddress.

     */

    @SuppressLint("NewApi")

    @NonNull

    static IpPrefix makeIpPrefix(@NonNull LinkAddress addr) {

        return new IpPrefix(addr.getAddress(), addr.getPrefixLength());

tests/unit/src/android/net/dhcp/DhcpLeaseRepositoryTest.java

+0 −6
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ import static java.util.stream.Collectors.toSet; 


import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.SuppressLint;

import android.net.IpPrefix;

import android.net.MacAddress;

import android.net.dhcp.DhcpServer.Clock;
@@ -85,7 +84,6 @@ public class DhcpLeaseRepositoryTest { 
    private static final Inet4Address TEST_INETADDR_2 = parseAddr4("192.168.42.249");

    private static final String TEST_HOSTNAME_1 = "hostname1";

    private static final String TEST_HOSTNAME_2 = "hostname2";

    @SuppressLint("NewApi")

    private static final IpPrefix TEST_IP_PREFIX = new IpPrefix(TEST_SERVER_ADDR, 22);

    private static final long TEST_TIME = 100L;

    private static final int TEST_LEASE_TIME_MS = 3_600_000;
@@ -151,7 +149,6 @@ public class DhcpLeaseRepositoryTest { 
        }

    }



    @SuppressLint("NewApi")

    @Test

    public void testAddressExhaustion() throws Exception {

        // Use a /28 to quickly run out of addresses
@@ -172,7 +169,6 @@ public class DhcpLeaseRepositoryTest { 
        verifyNoMoreInteractions(mCallbacks);

    }



    @SuppressLint("NewApi")

    @Test

    public void testUpdateParams_LeaseCleanup() throws Exception {

        // Inside /28:
@@ -233,7 +229,6 @@ public class DhcpLeaseRepositoryTest { 
        }

    }



    @SuppressLint("NewApi")

    @Test

    public void testUpdateParams_UsesNewPrefix() throws Exception {

        final IpPrefix newPrefix = new IpPrefix(parseAddr4("192.168.123.0"), 24);
@@ -543,7 +538,6 @@ public class DhcpLeaseRepositoryTest { 
        assertNotEquals(lease.getNetAddr(), newLease.getNetAddr());

    }



    @SuppressLint("NewApi")

    @Test

    public void testMarkLeaseDeclined_UsedIfOutOfAddresses() throws Exception {

        // Use a /28 to quickly run out of addresses

tests/unit/src/android/net/ip/IpClientTest.java

+0 −3
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ import static org.mockito.Mockito.when; 


import static java.util.Collections.emptySet;



import android.annotation.SuppressLint;

import android.app.AlarmManager;

import android.content.ContentResolver;

import android.content.Context;
@@ -297,7 +296,6 @@ public class IpClientTest { 
        return ipc;

    }



    @SuppressLint("NewApi")

    private void addIPv4Provisioning(LinkProperties lp) {

        final LinkAddress la = new LinkAddress(TEST_IPV4_LINKADDRESS);

        final RouteInfo defaultRoute = new RouteInfo(new IpPrefix(Inet4Address.ANY, 0),
@@ -627,7 +625,6 @@ public class IpClientTest { 
                TEST_IFNAME));

    }



    @SuppressLint("NewApi")

    static RouteInfo defaultIPV6Route(String gateway) {

        return new RouteInfo(new IpPrefix(Inet6Address.ANY, 0),

                InetAddresses.parseNumericAddress(gateway), TEST_IFNAME);

tests/unit/src/android/net/ip/IpReachabilityMonitorTest.kt

+0 −6
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
 */

package android.net.ip



import android.annotation.SuppressLint

import android.content.Context

import android.net.ip.IpNeighborMonitor.NeighborEventConsumer

import android.net.INetd
@@ -107,8 +106,6 @@ private val TEST_IPV6_DNS = parseNumericAddress("2001:db8::321") as Inet6Address 
private val TEST_IPV6_DNS2 = parseNumericAddress("2001:db8::456") as Inet6Address



private val TEST_IFACE = InterfaceParams("fake0", 21, null)



@SuppressLint("NewApi")

private val TEST_LINK_PROPERTIES = LinkProperties().apply {

    interfaceName = TEST_IFACE.name

    addLinkAddress(TEST_IPV4_LINKADDR)
@@ -126,7 +123,6 @@ private val TEST_LINK_PROPERTIES = LinkProperties().apply { 
    addDnsServer(TEST_IPV6_DNS)

}



@SuppressLint("NewApi")

private val TEST_IPV4_ONLY_LINK_PROPERTIES = LinkProperties().apply {

    interfaceName = TEST_IFACE.name

    addLinkAddress(TEST_IPV4_LINKADDR)
@@ -140,7 +136,6 @@ private val TEST_IPV4_ONLY_LINK_PROPERTIES = LinkProperties().apply { 
    addDnsServer(TEST_IPV4_GATEWAY_DNS)

}



@SuppressLint("NewApi")

private val TEST_IPV6_LINKLOCAL_SCOPED_LINK_PROPERTIES = LinkProperties().apply {

    interfaceName = TEST_IFACE.name

    addLinkAddress(TEST_IPV6_LINKADDR)
@@ -156,7 +151,6 @@ private val TEST_IPV6_LINKLOCAL_SCOPED_LINK_PROPERTIES = LinkProperties().apply 
    addDnsServer(TEST_IPV6_DNS)

}



@SuppressLint("NewApi")

private val TEST_DUAL_LINK_PROPERTIES = LinkProperties().apply {

    interfaceName = TEST_IFACE.name

    addLinkAddress(TEST_IPV4_LINKADDR)

tests/unit/src/android/net/shared/InitialConfigurationTest.java

+0 −3
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import static com.android.testutils.MiscAsserts.assertFieldCountEquals; 
import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertNotEquals;



import android.annotation.SuppressLint;

import android.net.IpPrefix;

import android.net.LinkAddress;
@@ -45,7 +44,6 @@ import java.util.function.Consumer; 
public class InitialConfigurationTest {

    private InitialConfiguration mConfig;



    @SuppressLint("NewApi")

    @Before

    public void setUp() {

        mConfig = new InitialConfiguration();
@@ -69,7 +67,6 @@ public class InitialConfigurationTest { 
        assertEquals(mConfig, unparceled);

    }



    @SuppressLint("NewApi")

    @Test

    public void testEquals() {

        assertEquals(mConfig, InitialConfiguration.copy(mConfig));