| commit | a53ed851dab22dfa9a7cc3e1b7f9d9c396cbe791 | [log] [tgz] |
|---|---|---|
| author | Prerana <preranap@google.com> | Thu Apr 28 04:02:05 2022 +0000 |
| committer | Prerana Patil <preranap@google.com> | Fri May 06 18:19:58 2022 +0000 |
| tree | 7de1bc773b55de665de2ecb330e9add37ecf79cc | |
| parent | bbbdc6b82fa0c7622a6a05c0dad11377ea70c270 [diff] [blame] |
Update VPN isolation code for excluded routes Bug: 230058738 Test: atest LinkPropertiesTest Result: https://paste.googleplex.com/4706859672928256 Change-Id: I970fca6b0e2cd358e9bd77152563d13367867c74 (cherry picked from commit 2b97bbebf4b85e0024fc75298e760fc03516be40) Merged-In: I970fca6b0e2cd358e9bd77152563d13367867c74
diff --git a/service/src/com/android/server/ConnectivityService.java b/service/src/com/android/server/ConnectivityService.java index 6de6625..de4b5b7 100644 --- a/service/src/com/android/server/ConnectivityService.java +++ b/service/src/com/android/server/ConnectivityService.java
@@ -8092,7 +8092,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) {