Skip adding ingress discard rule to OEM VPN am: df163f70fd am: 9c2f4c01bd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/28724996
Change-Id: Ia46d4964d03857c0496a98635de09950ba3ff73b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/service/src/com/android/server/ConnectivityService.java b/service/src/com/android/server/ConnectivityService.java
index 523062c..a12f3cd 100755
--- a/service/src/com/android/server/ConnectivityService.java
+++ b/service/src/com/android/server/ConnectivityService.java
@@ -8349,10 +8349,10 @@
* interfaces.
* Ingress discard rule is added to the address iff
* 1. The address is not a link local address
- * 2. The address is used by a single non-Legacy VPN interface and not used by any other
- * interfaces even non-VPN ones
- * Ingress discard rule is not be added to Legacy VPN since some Legacy VPNs need to receive
- * packet to VPN address via non-VPN interface.
+ * 2. The address is used by a single interface of VPN whose VPN type is not TYPE_VPN_LEGACY
+ * or TYPE_VPN_OEM and the address is not used by any other interfaces even non-VPN ones
+ * Ingress discard rule is not be added to TYPE_VPN_LEGACY or TYPE_VPN_OEM VPN since these VPNs
+ * might need to receive packet to VPN address via non-VPN interface.
* This method can be called during network disconnects, when nai has already been removed from
* mNetworkAgentInfos.
*
@@ -8387,8 +8387,10 @@
// for different network.
final Set<Pair<InetAddress, String>> ingressDiscardRules = new ArraySet<>();
for (final NetworkAgentInfo agent : nais) {
+ final int vpnType = getVpnType(agent);
if (!agent.isVPN() || agent.isDestroyed()
- || getVpnType(agent) == VpnManager.TYPE_VPN_LEGACY) {
+ || vpnType == VpnManager.TYPE_VPN_LEGACY
+ || vpnType == VpnManager.TYPE_VPN_OEM) {
continue;
}
final LinkProperties agentLp = (nai == agent) ? lp : agent.linkProperties;