commit e4bde7d475135252cfa799d337ebbb029ebaf937
author Sreeram Ramachandran <sreeram@google.com> Thu Apr 10 15:58:39 2014 -0700
committer Lorenzo Colitti <lorenzo@google.com> Wed May 14 03:56:32 2014 -0700
tree f111f06c3973d7eefcd4a7dd47da211e1cf1a9c9
parent 913c895216c0cb248ed0ce910e69dd84b285c064

Update the API for permission set/clear.

Change-Id: I1d10a5702a77cb24fa52016bb497d52270379f8a

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 878d6c1..fea1d3e 100644
--- a/services/core/java/com/android/server/NetworkManagementService.java
+++ b/services/core/java/com/android/server/NetworkManagementService.java
@@ -16,6 +16,7 @@
 
 package com.android.server;
 
+import static android.Manifest.permission.CHANGE_NETWORK_STATE;
 import static android.Manifest.permission.CONNECTIVITY_INTERNAL;
 import static android.Manifest.permission.DUMP;
 import static android.Manifest.permission.SHUTDOWN;
@@ -2155,9 +2156,9 @@
     public void setPermission(boolean internal, boolean changeNetState, int[] uids) {
         mContext.enforceCallingOrSelfPermission(CONNECTIVITY_INTERNAL, TAG);
 
-        final Command cmd = new Command("network", "permission", "set");
-        if (internal) cmd.appendArg("CI");
-        if (changeNetState) cmd.appendArg("CNS");
+        final Command cmd = new Command("network", "permission", "user", "set");
+        if (internal) cmd.appendArg(CONNECTIVITY_INTERNAL);
+        if (changeNetState) cmd.appendArg(CHANGE_NETWORK_STATE);
         for (int i=0; i<uids.length; i++) {
             cmd.appendArg(uids[i]);
         }
@@ -2173,7 +2174,7 @@
     public void clearPermission(int[] uids) {
         mContext.enforceCallingOrSelfPermission(CONNECTIVITY_INTERNAL, TAG);
 
-        final Command cmd = new Command("network", "permission", "clear");
+        final Command cmd = new Command("network", "permission", "user", "clear");
         for (int i=0; i<uids.length; i++) {
             cmd.appendArg(uids[i]);
         }