From f0b957007e94b67962da5b20dfbd3627d16aadde Mon Sep 17 00:00:00 2001 From: Lucas Lin Date: Wed, 16 Jun 2021 04:00:13 +0000 Subject: [PATCH] Set legacy type for VPN VPN legacy type was lost when NetworkInfo was replaced by NetworkAgentConfig. Set legacy type when creating NetworkAgentConfig to fix it. Original NetworkInfo log: NI = [type: [], state: CONNECTED/CONNECTED, reason: (unspecified), extra: , failover: false, available: true, roaming: false], Type = -1 Current NetworkInfo log: NI = [type: VPN[], state: CONNECTED/CONNECTED, reason: (unspecified), extra: , failover: false, available: true, roaming: false], Type = 17 Bug: 184261389 Test: atest CtsHostsideNetworkTests:HostsideVpnTests#testDefault Original-Change: https://android-review.googlesource.com/1733495 Merged-In: I237f7ff4d6899530c4ad057a84d3b8b34513be79 Change-Id: I237f7ff4d6899530c4ad057a84d3b8b34513be79 --- services/core/java/com/android/server/connectivity/Vpn.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/services/core/java/com/android/server/connectivity/Vpn.java b/services/core/java/com/android/server/connectivity/Vpn.java index ddac19b540aea..7148becca2812 100644 --- a/services/core/java/com/android/server/connectivity/Vpn.java +++ b/services/core/java/com/android/server/connectivity/Vpn.java @@ -1250,6 +1250,8 @@ public class Vpn { updateState(DetailedState.CONNECTING, "agentConnect"); final NetworkAgentConfig networkAgentConfig = new NetworkAgentConfig.Builder() + .setLegacyType(ConnectivityManager.TYPE_VPN) + .setLegacyTypeName("VPN") .setBypassableVpn(mConfig.allowBypass && !mLockdown) .build();