From 584dbee59ceb7750e22c48371342635aa6a98517 Mon Sep 17 00:00:00 2001 From: Sreeram Ramachandran Date: Tue, 4 Nov 2014 10:18:25 -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. Bug: 18194858 Change-Id: Ib3ec377ab26ce904d3d4678f04edec6cb1260517 --- server/CommandListener.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/CommandListener.cpp b/server/CommandListener.cpp index 6e6f965..f97ac57 100644 --- a/server/CommandListener.cpp +++ b/server/CommandListener.cpp @@ -54,10 +54,10 @@ namespace { const unsigned NUM_OEM_IDS = NetworkController::MAX_OEM_ID - NetworkController::MIN_OEM_ID + 1; Permission stringToPermission(const char* arg) { - if (!strcmp(arg, "android.permission.CHANGE_NETWORK_STATE")) { + if (!strcmp(arg, "NETWORK")) { return PERMISSION_NETWORK; } - if (!strcmp(arg, "android.permission.CONNECTIVITY_INTERNAL")) { + if (!strcmp(arg, "SYSTEM")) { return PERMISSION_SYSTEM; } return PERMISSION_NONE; -- 2.11.0