summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Chiachang Wang <chiachangwang@google.com> 2023-09-07 10:02:32 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-07 10:02:32 +0000
commit0f95d0c346c0e7438944594a07645b6adfa045f1 (patch)
tree6bd6f1b6e0df77d6a954eaef1bea8151ca0370ce
parentd74c2a1781d4fe997a7f8cb08f043585a41f0910 (diff)
parent980827284180d1f3058fe5dd28257fe305397c72 (diff)
Merge "Add VPN name into the extra info of NetworkInfo" into main am: 9808272841
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2732896 Change-Id: If3f0c01c5701e6cb0ee2783cd8668883d288cdc1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--services/core/java/com/android/server/connectivity/Vpn.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/connectivity/Vpn.java b/services/core/java/com/android/server/connectivity/Vpn.java
index bfccd58b3f5d..53fbe8f37046 100644
--- a/services/core/java/com/android/server/connectivity/Vpn.java
+++ b/services/core/java/com/android/server/connectivity/Vpn.java
@@ -1741,6 +1741,7 @@ public class Vpn {
.setBypassableVpn(bypassable)
.setVpnRequiresValidation(mConfig.requiresInternetValidation)
.setLocalRoutesExcludedForVpn(mConfig.excludeLocalRoutes)
+ .setLegacyExtraInfo("VPN:" + mPackage)
.build();
capsBuilder.setOwnerUid(mOwnerUID);