commit e19a7da47f79a4ca8ed199171865e8084aad21a5
author Lucas Lin <lucaslin@google.com> Wed Jun 16 02:22:45 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jun 16 02:22:45 2021 +0000
tree d751651229d5bad429d4d26cf51814c278509036
parent a9d6e01b6ed8a44d31527ef8125cd6dbbf8ccfa7
parent d1de5bd3d9be0df187945c6ab9a27cde5b36d015

Merge "Set legacy type for VPN"

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();