summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRubin Xu <rubinxu@google.com>2018-01-11 10:59:19 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2018-04-17 18:02:11 +0000
commit5293b32639e2752dcef4a996196734ff62076447 (patch)
tree88d4b635fe7c34a06571bf89a941df8f6c86f974
parent4b0e9645aaab41fcc89812278e5c4662e044c7c6 (diff)
downloadbase-5293b32639e2752dcef4a996196734ff62076447.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.java2
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) {