commit 338cb38cad5a1737dff1f57e13c5dbd156b882b3
author Eugene Susla <eugenesusla@google.com> Fri Mar 09 18:42:08 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 09 18:42:08 2018 +0000
tree 55eb9d1c3aa9c0618b214e9b402a7e6020a06299
parent 28c7060b11917b79780413c804e3e922d0792231
parent cf92266ad9094aaaad484ca1739bab3e54bb71d0

Merge changes from topic "recognition_service-mnc-dev" into nyc-dev

* changes:
  [automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am: 5a28e533fe am: b91acca082 am: 26aaadd3b5 skipped: a1ad0de1f7
  [automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am: 5a28e533fe am: b91acca082 am: 26aaadd3b5
  [automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am: 5a28e533fe am: b91acca082
  [automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am: 5a28e533fe
  [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService

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 f236877..7996628 100644
--- a/services/core/java/com/android/server/NetworkManagementService.java
+++ b/services/core/java/com/android/server/NetworkManagementService.java
@@ -1852,6 +1852,8 @@
     @Override
     public void setAllowOnlyVpnForUids(boolean add, UidRange[] uidRanges)
             throws ServiceSpecificException {
+        mContext.enforceCallingOrSelfPermission(CONNECTIVITY_INTERNAL, TAG);
+
         try {
             mNetdService.networkRejectNonSecureVpn(add, uidRanges);
         } catch (ServiceSpecificException e) {