| commit | c2c813491f72ecbd24710d699bd59d648d2f81e4 | [log] [tgz] |
|---|---|---|
| author | Cassie Wang <cassiewang@google.com> | Mon Jun 19 12:47:39 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jun 19 12:47:39 2023 +0000 |
| tree | d8a9a0aabf93c1478d38efae792ee1c0d16989cd | |
| parent | afea93413f7a2848de16b994fd96ab9e43bee685 [diff] | |
| parent | 2cb4db028b9ad3e2d7a62de4268f8569aea4bfaa [diff] |
Merge "Allow any caller with CONTROL_VPN to disconnect existing VPN" am: 6460d464c3 am: 2cb4db028b Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2624101 Change-Id: Ia93b2ba5d0dfe672f8dba50f2537ba069069b642 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/services/core/java/com/android/server/connectivity/Vpn.java b/services/core/java/com/android/server/connectivity/Vpn.java index e85eee81..6b69e1c 100644 --- a/services/core/java/com/android/server/connectivity/Vpn.java +++ b/services/core/java/com/android/server/connectivity/Vpn.java
@@ -1389,7 +1389,7 @@ } // Check that the caller is authorized. - enforceControlPermission(); + enforceControlPermissionOrInternalCaller(); // Stop an existing always-on VPN from being dethroned by other apps. if (mAlwaysOn && !isCurrentPreparedPackage(newPackage)) {