commit d1de5bd3d9be0df187945c6ab9a27cde5b36d015
author lucaslin <lucaslin@google.com> Fri Jun 11 03:08:01 2021 +0800
committer Lucas Lin <lucaslin@google.com> Fri Jun 11 10:23:37 2021 +0000
tree 423ced6e1372af0016898cc60fe7e0a3cf8416db
parent 1c0577193b6060ecea4d516a732db12d1b99e297

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
Change-Id: I237f7ff4d6899530c4ad057a84d3b8b34513be79

services/core/java/com/android/server/connectivity/Vpn.java

diff --git a/services/core/java/com/android/server/connectivity/Vpn.java b/services/core/java/com/android/server/connectivity/Vpn.java
index fd53a10..bf0dda7 100644
--- a/services/core/java/com/android/server/connectivity/Vpn.java
+++ b/services/core/java/com/android/server/connectivity/Vpn.java
@@ -1248,6 +1248,8 @@
         updateState(DetailedState.CONNECTING, "agentConnect");
 
         final NetworkAgentConfig networkAgentConfig = new NetworkAgentConfig.Builder()
+                .setLegacyType(ConnectivityManager.TYPE_VPN)
+                .setLegacyTypeName("VPN")
                 .setBypassableVpn(mConfig.allowBypass && !mLockdown)
                 .build();