Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "am-af991497-a243-423d-8f58-f6bc1131a734" into nyc-mr1-dev

Browse Source 
* changes:
  [automerger] [DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids am: 41d8bf1fed am: 595f82f99e
  [automerger] [DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids am: 41d8bf1fed
  [DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids
This commit is contained in:
TreeHugger Robot
2018-03-09 15:01:42 +00:00
committed by Android (Google) Code Review
parent e0b5c2d25e 3aaa23e1e2
commit 377fd4ea35
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/NetworkManagementService.java
View File

@@ -1864,6 +1864,8 @@ public class NetworkManagementService extends INetworkManagementService.Stub
@Override
public void setAllowOnlyVpnForUids(boolean add, UidRange[] uidRanges)
throws ServiceSpecificException {
mContext.enforceCallingOrSelfPermission(CONNECTIVITY_INTERNAL, TAG);
try {
mNetdService.networkRejectNonSecureVpn(add, uidRanges);
} catch (ServiceSpecificException e) {