diff options
| author | 2023-06-19 12:12:57 +0000 | |
|---|---|---|
| committer | 2023-06-19 12:12:57 +0000 | |
| commit | 2cb4db028b9ad3e2d7a62de4268f8569aea4bfaa (patch) | |
| tree | 352950fcdc109aab78b201b56d5830a33aaf5490 | |
| parent | 9b53553c806555371bee42d76e24dec57a844241 (diff) | |
| parent | 6460d464c31d22ed444498c28b313d9512546853 (diff) | |
Merge "Allow any caller with CONTROL_VPN to disconnect existing VPN" am: 6460d464c3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2624101
Change-Id: I0282312b719a848181a6be0d3229efe20507f3c2
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.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/connectivity/Vpn.java b/services/core/java/com/android/server/connectivity/Vpn.java index e85eee817d29..6b69e1caa985 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 @@ public class Vpn { } // Check that the caller is authorized. - enforceControlPermission(); + enforceControlPermissionOrInternalCaller(); // Stop an existing always-on VPN from being dethroned by other apps. if (mAlwaysOn && !isCurrentPreparedPackage(newPackage)) { |