commit fb6e4bc01b3af924fbca3c566bfac90a92a906b5
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Mar 09 15:01:42 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 09 15:01:42 2018 +0000
tree 89c30bffe4384c2d4a6a9a73fa2aa0bbee091027
parent 71478241eb069f13cb1d1e9550d7bb35f8a8a121
parent 595f82f99ee2dc2b03e8c503ee11ffddc641121c

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

* changes:
  [automerger] [DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids am: 41d8bf1fed
  [DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids

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

diff --git a/services/core/java/com/android/server/NetworkManagementService.java b/services/core/java/com/android/server/NetworkManagementService.java
index bdbd066..44031cf 100644
--- a/services/core/java/com/android/server/NetworkManagementService.java
+++ b/services/core/java/com/android/server/NetworkManagementService.java
@@ -1864,6 +1864,8 @@
     @Override
     public void setAllowOnlyVpnForUids(boolean add, UidRange[] uidRanges)
             throws ServiceSpecificException {
+        mContext.enforceCallingOrSelfPermission(CONNECTIVITY_INTERNAL, TAG);
+
         try {
             mNetdService.networkRejectNonSecureVpn(add, uidRanges);
         } catch (ServiceSpecificException e) {