diff options
| author | Rubin Xu <rubinxu@google.com> | 2018-01-11 10:59:19 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-04-13 22:46:23 +0000 |
| commit | 1326c6f3bf54922ff9119706836a7a2453f581ac (patch) | |
| tree | 88d4b635fe7c34a06571bf89a941df8f6c86f974 | |
| parent | f4064921b285a705f4342008b0f7cb15829ea940 (diff) | |
| download | base-1326c6f3bf54922ff9119706836a7a2453f581ac.tar.gz | |
[DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids
Bug: 63000005
Test: runtest frameworks-net -c com.android.server.connectivity.VpnTest
Test: cts-tradefed run cts-dev -m CtsDevicePolicyManagerTestCases -t com.android.cts.devicepolicy.MixedDeviceOwnerTest#testAlwaysOnVpnLockDown
Merged-In: Ia1a82ee73d8617f3124032986fe6c09c14bf7752
Change-Id: Ia1a82ee73d8617f3124032986fe6c09c14bf7752
(cherry picked from commit f915e04d5010c4dfffad263fa70c1e412e856314)
| -rw-r--r-- | services/core/java/com/android/server/NetworkManagementService.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/NetworkManagementService.java b/services/core/java/com/android/server/NetworkManagementService.java index 1854e2b740f4..66d01c7885c9 100644 --- a/services/core/java/com/android/server/NetworkManagementService.java +++ b/services/core/java/com/android/server/NetworkManagementService.java @@ -1777,6 +1777,8 @@ public class NetworkManagementService extends INetworkManagementService.Stub @Override public void setAllowOnlyVpnForUids(boolean add, UidRange[] uidRanges) throws ServiceSpecificException { + mContext.enforceCallingOrSelfPermission(NETWORK_STACK, TAG); + try { mNetdService.networkRejectNonSecureVpn(add, uidRanges); } catch (ServiceSpecificException e) { |