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

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

Browse Source 
* commit '9b32f9a46687c1f9d720452f8972e43f1d15294b':
  Don't use framework permission strings for netd permissions.
This commit is contained in:
Sreeram Ramachandran
2014-11-04 22:11:24 +00:00
committed by Android Git Automerger
parent 954f2567f9 9b32f9a466
commit ebb0bdb0f1
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/connectivity/PermissionMonitor.java
View File

@@ -191,8 +191,8 @@ public class PermissionMonitor {
} }
try { try {
if (add) { if (add) {
mNetd.setPermission(CHANGE_NETWORK_STATE, toIntArray(network)); mNetd.setPermission("NETWORK", toIntArray(network));
mNetd.setPermission(CONNECTIVITY_INTERNAL, toIntArray(system)); mNetd.setPermission("SYSTEM", toIntArray(system));
} else { } else {
mNetd.clearPermission(toIntArray(network)); mNetd.clearPermission(toIntArray(network));
mNetd.clearPermission(toIntArray(system)); mNetd.clearPermission(toIntArray(system));