From 5c36486ea0a01f8e11ce2c365e435c7968293de7 Mon Sep 17 00:00:00 2001 From: Sreeram Ramachandran Date: Tue, 4 Nov 2014 10:15:03 -0800 Subject: [PATCH] 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 e203d89. Bug: 21900139 Bug: 18194858 Change-Id: Ib3ec377ab26ce904d3d4678f04edec6cb1260517 (cherry picked from commit d9bf64ba1da439860da6a4ad79f08ac6c349ad0a) --- .../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 238402f45e..debda1483d 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));