summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Sreeram Ramachandran <sreeram@google.com> 2014-11-04 21:59:22 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2014-11-04 21:59:23 +0000
commit0610ff97f11d37d514ea20fcbd73a96ede3518ce (patch)
treee9386573a1d81a256c2152e235aff3b5cb49a3a4
parent18b055e106d5452ef390716d3ea8d1641a225361 (diff)
parent0f8f120839120da543ee186cf25ce6e215423e99 (diff)
Merge "Don't use framework permission strings for netd permissions." into lmp-mr1-dev
-rw-r--r--services/core/java/com/android/server/connectivity/PermissionMonitor.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/connectivity/PermissionMonitor.java b/services/core/java/com/android/server/connectivity/PermissionMonitor.java
index 238402f45e87..debda1483d9a 100644
--- a/services/core/java/com/android/server/connectivity/PermissionMonitor.java
+++ b/services/core/java/com/android/server/connectivity/PermissionMonitor.java
@@ -191,8 +191,8 @@ public class PermissionMonitor {
}
try {
if (add) {
- mNetd.setPermission(CHANGE_NETWORK_STATE, toIntArray(network));
- mNetd.setPermission(CONNECTIVITY_INTERNAL, toIntArray(system));
+ mNetd.setPermission("NETWORK", toIntArray(network));
+ mNetd.setPermission("SYSTEM", toIntArray(system));
} else {
mNetd.clearPermission(toIntArray(network));
mNetd.clearPermission(toIntArray(system));