commit ebb0bdb0f19b4f87f9080e37fb5a7ad540c0ccb2
author Sreeram Ramachandran <sreeram@google.com> Tue Nov 04 22:11:24 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Nov 04 22:11:24 2014 +0000
tree c24de96e5d6f038f451d8dc8da078f14f95a4be8
parent 954f2567f90f1fa8b3d3d7d0c426ebd35494e182
parent 9b32f9a46687c1f9d720452f8972e43f1d15294b

am 9b32f9a4: am 0610ff97: Merge "Don\'t use framework permission strings for netd permissions." into lmp-mr1-dev

* commit '9b32f9a46687c1f9d720452f8972e43f1d15294b':
  Don't use framework permission strings for netd permissions.

services/core/java/com/android/server/connectivity/PermissionMonitor.java

diff --git a/services/core/java/com/android/server/connectivity/PermissionMonitor.java b/services/core/java/com/android/server/connectivity/PermissionMonitor.java
index 238402f..debda14 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 @@
         }
         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));