From f1f45fe012ddbd516e797099994c400a1cac8581 Mon Sep 17 00:00:00 2001 From: Sreeram Ramachandran Date: Tue, 4 Nov 2014 10:15:03 -0800 Subject: Don't use framework permission strings for netd permissions. 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 0f8f120839120da543ee186cf25ce6e215423e99) --- .../core/java/com/android/server/connectivity/PermissionMonitor.java | 4 ++-- 1 file 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)); -- cgit v1.2.3-59-g8ed1b