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

Merge "[DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids" into oc-dev

Browse Source
This commit is contained in:
Rubin Xu
2018-03-09 14:59:30 +00:00
committed by Android (Google) Code Review
parent b6b6c01847 f915e04d50
commit a9df845321
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,6 +18,7 @@ package com.android.server;
import static android.Manifest.permission.CONNECTIVITY_INTERNAL; import static android.Manifest.permission.CONNECTIVITY_INTERNAL;
import static android.Manifest.permission.DUMP; import static android.Manifest.permission.DUMP;
import static android.Manifest.permission.NETWORK_STACK;
import static android.Manifest.permission.SHUTDOWN; import static android.Manifest.permission.SHUTDOWN;
import static android.net.NetworkPolicyManager.FIREWALL_CHAIN_DOZABLE; import static android.net.NetworkPolicyManager.FIREWALL_CHAIN_DOZABLE;
import static android.net.NetworkPolicyManager.FIREWALL_CHAIN_NAME_DOZABLE; import static android.net.NetworkPolicyManager.FIREWALL_CHAIN_NAME_DOZABLE;
@@ -1709,6 +1710,8 @@ public class NetworkManagementService extends INetworkManagementService.Stub
@Override @Override
public void setAllowOnlyVpnForUids(boolean add, UidRange[] uidRanges) public void setAllowOnlyVpnForUids(boolean add, UidRange[] uidRanges)
throws ServiceSpecificException { throws ServiceSpecificException {
mContext.enforceCallingOrSelfPermission(NETWORK_STACK, TAG);
try { try {
mNetdService.networkRejectNonSecureVpn(add, uidRanges); mNetdService.networkRejectNonSecureVpn(add, uidRanges);
} catch (ServiceSpecificException e) { } catch (ServiceSpecificException e) {