commit 687ddf69283940b66a1d89b555b35ed9c60d808a
author Jeff Sharkey <jsharkey@google.com> Mon Apr 16 16:54:32 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 16 16:54:32 2018 +0000
tree 0885dd218b1f75883164dfa39e42d58cf098b489
parent 04efa577988736c994a2ddd5e66f0a38157b764f
parent 069002e639101baf5312fada3761908b87b66125

Merge "Revert "Revert "OP_GET_USAGE_STATS should be noted, not checked.""" into pi-dev

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

diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index 079d815..5afb0a6 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -1402,7 +1402,7 @@
             NetworkCapabilities nc, int callerPid, int callerUid) {
         final NetworkCapabilities newNc = new NetworkCapabilities(nc);
         if (!checkSettingsPermission(callerPid, callerUid)) newNc.setUids(null);
-        if (!checkNetworkStackPermission(callerPid, callerUid)) newNc.setSSID(null);
+        if (!checkSettingsPermission(callerPid, callerUid)) newNc.setSSID(null);
         return newNc;
     }
 
@@ -1662,11 +1662,6 @@
                 android.Manifest.permission.NETWORK_SETTINGS, pid, uid);
     }
 
-    private boolean checkNetworkStackPermission(int pid, int uid) {
-        return PERMISSION_GRANTED == mContext.checkPermission(
-                android.Manifest.permission.NETWORK_STACK, pid, uid);
-    }
-
     private void enforceTetherAccessPermission() {
         mContext.enforceCallingOrSelfPermission(
                 android.Manifest.permission.ACCESS_NETWORK_STATE,
@@ -4247,7 +4242,7 @@
     // calling app has permission to do so.
     private void ensureSufficientPermissionsForRequest(NetworkCapabilities nc,
             int callerPid, int callerUid) {
-        if (null != nc.getSSID() && !checkNetworkStackPermission(callerPid, callerUid)) {
+        if (null != nc.getSSID() && !checkSettingsPermission(callerPid, callerUid)) {
             throw new SecurityException("Insufficient permissions to request a specific SSID");
         }
     }