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

Don't use framework permission strings for netd permissions.

Browse Source 
These framework permission strings were being used as arbitrary labels
that mapped to netd permissions that have completely different meaning.
This leads to confusion, so use different strings.

This is being cherry picked from lmp-mr1-dev to lmp-dev to fix failures
when creating restricted networks due to prior back-port a120442.

Bug: 21900139
Bug: 18194858
Change-Id: Ib3ec377ab26ce904d3d4678f04edec6cb1260517
(cherry picked from commit 0f8f120839)
This commit is contained in:
Sreeram Ramachandran
2014-11-04 10:15:03 -08:00
committed by Paul Jensen
parent f5f03a19af
commit f1f45fe012
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 {
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));