Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update the API for permission set/clear."

Browse Source
This commit is contained in:
Lorenzo Colitti
2014-05-14 12:43:57 +00:00
committed by Android (Google) Code Review
parent 02af9da5a9 e4bde7d475
commit e8dbda2f76
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/core/java/com/android/server/NetworkManagementService.java
View File

@@ -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 class NetworkManagementService extends INetworkManagementService.Stub
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 class NetworkManagementService extends INetworkManagementService.Stub
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]);
}