commit 48380e413270b9f4ff216f6649d1dc8acdfda45d
author Remi NGUYEN VAN <reminv@google.com> Fri Jul 15 16:42:49 2022 +0900
committer Remi NGUYEN VAN <reminv@google.com> Fri Jul 15 16:46:14 2022 +0900
tree 4a15f56065b5d9af1e8b24bb47f0744b4b11ddc7
parent 66c27c18a265a46bfc89e88a23598c39bc2fe36e

Revert EXCLUDED_ROUTES to only keep RTN_UNICAST

Revert the previous change to filter out all non-RTN_THROW routes when
EXCLUDED_ROUTES is disabled, as that behavior is CTS tested for T, and
has been used by T for a while. The previous change already ensured that
there is no behavior change on S, so this is the safest approach.

This fixes HostsideLinkPropertiesGatingTests.

Bug: 239046959
Test: atest LinkPropertiesTest CtsHostsideNetworkTests
Change-Id: I55e078cdc06341f4957fe7bc743c0022b2c7d3da

tests/common/java/android/net/LinkPropertiesTest.java

diff --git a/tests/common/java/android/net/LinkPropertiesTest.java b/tests/common/java/android/net/LinkPropertiesTest.java
index 319dbf4..9506fc9 100644
--- a/tests/common/java/android/net/LinkPropertiesTest.java
+++ b/tests/common/java/android/net/LinkPropertiesTest.java
@@ -1339,12 +1339,12 @@
         assertEquals(0, lp.getRoutes().size());
 
         lp.addRoute(new RouteInfo(new IpPrefix(ADDRV4, 0), RTN_UNREACHABLE));
-        assertEquals(1, lp.getRoutes().size());
+        assertEquals(0, lp.getRoutes().size());
 
         lp.addRoute(new RouteInfo(new IpPrefix(ADDRV6, 5), RTN_THROW));
-        assertEquals(1, lp.getRoutes().size());
+        assertEquals(0, lp.getRoutes().size());
 
         lp.addRoute(new RouteInfo(new IpPrefix(ADDRV6, 2), RTN_UNICAST));
-        assertEquals(2, lp.getRoutes().size());
+        assertEquals(1, lp.getRoutes().size());
     }
 }