| commit | ef1335ebdf6862c6a30686603c7ee549dbb7b359 | [log] [tgz] |
|---|---|---|
| author | Rubin Xu <rubinxu@google.com> | Thu Jan 11 10:59:19 2018 +0000 |
| committer | android-build-team Robot <android-build-team-robot@google.com> | Fri Apr 13 22:58:04 2018 +0000 |
| tree | 88d4b635fe7c34a06571bf89a941df8f6c86f974 | |
| parent | 2950276f61220e00749f8e24e0c773928fefaed8 [diff] |
[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)
diff --git a/services/core/java/com/android/server/NetworkManagementService.java b/services/core/java/com/android/server/NetworkManagementService.java index 1854e2b..66d01c7 100644 --- a/services/core/java/com/android/server/NetworkManagementService.java +++ b/services/core/java/com/android/server/NetworkManagementService.java
@@ -1777,6 +1777,8 @@ @Override public void setAllowOnlyVpnForUids(boolean add, UidRange[] uidRanges) throws ServiceSpecificException { + mContext.enforceCallingOrSelfPermission(NETWORK_STACK, TAG); + try { mNetdService.networkRejectNonSecureVpn(add, uidRanges); } catch (ServiceSpecificException e) {