| commit | 2b97bbebf4b85e0024fc75298e760fc03516be40 | [log] [tgz] |
|---|---|---|
| author | Prerana <preranap@google.com> | Thu Apr 28 04:02:05 2022 +0000 |
| committer | Prerana Patil <preranap@google.com> | Fri Apr 29 22:23:02 2022 +0000 |
| tree | 260c161794cb2fb2fc80926af91093a1a67ee818 | |
| parent | ac8935bee7769d4c4418cdd48d525ebdc6a2667a [diff] [blame] |
Update VPN isolation code for excluded routes Bug: 230058738 Test: atest LinkPropertiesTest Result: https://paste.googleplex.com/4706859672928256 Change-Id: I970fca6b0e2cd358e9bd77152563d13367867c74
diff --git a/service/src/com/android/server/ConnectivityService.java b/service/src/com/android/server/ConnectivityService.java index d79bdb8..cfa47e3 100644 --- a/service/src/com/android/server/ConnectivityService.java +++ b/service/src/com/android/server/ConnectivityService.java
@@ -8056,7 +8056,8 @@ && nc.getOwnerUid() != Process.SYSTEM_UID && lp.getInterfaceName() != null && (lp.hasIpv4DefaultRoute() || lp.hasIpv4UnreachableDefaultRoute()) - && (lp.hasIpv6DefaultRoute() || lp.hasIpv6UnreachableDefaultRoute()); + && (lp.hasIpv6DefaultRoute() || lp.hasIpv6UnreachableDefaultRoute()) + && !lp.hasExcludeRoute(); } private static UidRangeParcel[] toUidRangeStableParcels(final @NonNull Set<UidRange> ranges) {