Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 404881ae authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

* changes:
  [automerger] [DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids am: 41d8bf1f am: 595f82f9 am: 3aaa23e1
  [automerger] [DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids am: 41d8bf1f am: 595f82f9
  [automerger] [DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids am: 41d8bf1f
  [DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids
parents 267a5dbd 4b71619f

services/core/java/com/android/server/NetworkManagementService.java

+2 −0
Original line number Diff line number Diff line
@@ -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) {