commit 84f48cdf9f208962d28d7f34643094f3c2437c8d
author Chenbo Feng <fengc@google.com> Mon Apr 22 15:34:40 2019 -0700
committer Chenbo Feng <fengc@google.com> Tue May 07 12:58:01 2019 -0700
tree 0da9b690dfe9d3c2b0926bdea5102aded799d466
parent aae6f53ed0a1b0769c58774f702f9cbb49a0bf98

replace NO_PERMISSIONS with PERMISSION_NONE

As part of the effort to simplify the design of permission control
between system server and netd, remove the NO_PERMISSIONS constant used
by trafficController and share the constant PERMISSION_NONE with
networkController instead.

Bug: 128944261
Test: netd_integration_test netd_unit_test
Change-Id: If3eb19adc15b6c23c95fc4b9bc699fd1a515e0ac

server/TrafficControllerTest.cpp

diff --git a/server/TrafficControllerTest.cpp b/server/TrafficControllerTest.cpp
index db3a6c6..c97c104 100644
--- a/server/TrafficControllerTest.cpp
+++ b/server/TrafficControllerTest.cpp
@@ -272,7 +272,7 @@
 
     void removePrivilegedUid(uid_t uid) {
         std::vector privilegedUid = {uid};
-        mTc.setPermissionForUids(INetd::NO_PERMISSIONS, privilegedUid);
+        mTc.setPermissionForUids(INetd::PERMISSION_NONE, privilegedUid);
     }
 
     void expectFakeStatsUnchanged(uint64_t cookie, uint32_t tag, uint32_t uid,
@@ -395,7 +395,7 @@
     expectMapEmpty(mFakeCookieTagMap);
 
     // Clean up the permission
-    mTc.setPermissionForUids(INetd::NO_PERMISSIONS, callingUid);
+    mTc.setPermissionForUids(INetd::PERMISSION_NONE, callingUid);
     expectPrivilegedUserSetEmpty();
 }
 
@@ -857,8 +857,8 @@
 
     std::vector<uid_t> appUids = {TEST_UID, TEST_UID2, TEST_UID3};
 
-    mTc.setPermissionForUids(INetd::NO_PERMISSIONS, appUids);
-    expectUidPermissionMapValues(appUids, INetd::NO_PERMISSIONS);
+    mTc.setPermissionForUids(INetd::PERMISSION_NONE, appUids);
+    expectUidPermissionMapValues(appUids, INetd::PERMISSION_NONE);
 }
 
 TEST_F(TrafficControllerTest, TestPermissionUninstalled) {
@@ -891,9 +891,9 @@
     expectUidPermissionMapValues(appUids, INetd::PERMISSION_UPDATE_DEVICE_STATS);
     expectPrivilegedUserSet(appUids);
 
-    mTc.setPermissionForUids(INetd::NO_PERMISSIONS, appUids);
+    mTc.setPermissionForUids(INetd::PERMISSION_NONE, appUids);
     expectPrivilegedUserSetEmpty();
-    expectUidPermissionMapValues(appUids, INetd::NO_PERMISSIONS);
+    expectUidPermissionMapValues(appUids, INetd::PERMISSION_NONE);
 }
 
 TEST_F(TrafficControllerTest, TestRevokeUpdateStatsPermission) {
@@ -905,12 +905,12 @@
     expectPrivilegedUserSet(appUids);
 
     std::vector<uid_t> uidToRemove = {TEST_UID};
-    mTc.setPermissionForUids(INetd::NO_PERMISSIONS, uidToRemove);
+    mTc.setPermissionForUids(INetd::PERMISSION_NONE, uidToRemove);
 
     std::vector<uid_t> uidRemain = {TEST_UID3, TEST_UID2};
     expectPrivilegedUserSet(uidRemain);
 
-    mTc.setPermissionForUids(INetd::NO_PERMISSIONS, uidRemain);
+    mTc.setPermissionForUids(INetd::PERMISSION_NONE, uidRemain);
     expectPrivilegedUserSetEmpty();
 }
 
@@ -919,9 +919,9 @@
 
     std::vector<uid_t> appUids = {TEST_UID, TEST_UID2, TEST_UID3};
 
-    mTc.setPermissionForUids(INetd::NO_PERMISSIONS, appUids);
+    mTc.setPermissionForUids(INetd::PERMISSION_NONE, appUids);
     expectPrivilegedUserSetEmpty();
-    expectUidPermissionMapValues(appUids, INetd::NO_PERMISSIONS);
+    expectUidPermissionMapValues(appUids, INetd::PERMISSION_NONE);
 }
 
 TEST_F(TrafficControllerTest, TestGrantDuplicatePermissionSlientlyFail) {
@@ -937,8 +937,8 @@
 
     expectPrivilegedUserSetEmpty();
 
-    mTc.setPermissionForUids(INetd::NO_PERMISSIONS, appUids);
-    expectUidPermissionMapValues(appUids, INetd::NO_PERMISSIONS);
+    mTc.setPermissionForUids(INetd::PERMISSION_NONE, appUids);
+    expectUidPermissionMapValues(appUids, INetd::PERMISSION_NONE);
 
     mTc.setPermissionForUids(INetd::PERMISSION_UPDATE_DEVICE_STATS, appUids);
     expectPrivilegedUserSet(appUids);
@@ -946,7 +946,7 @@
     mTc.setPermissionForUids(INetd::PERMISSION_UPDATE_DEVICE_STATS, uidToAdd);
     expectPrivilegedUserSet(appUids);
 
-    mTc.setPermissionForUids(INetd::NO_PERMISSIONS, appUids);
+    mTc.setPermissionForUids(INetd::PERMISSION_NONE, appUids);
     expectPrivilegedUserSetEmpty();
 }