Implement addUsers()/removeUsers() in derived classes

The implementation of addUsers() and removeUsers() are different between
virtual network, physical network, and others. Virtualize both functions
in base class and override them in derived classes for specialization.

Test: atest
Change-Id: Ie3baeb404d2cd9513efb95857de53b4b3079be0b

1 files changed, 0 insertions, 47 deletions

diff --git a/server/Network.cpp b/server/Network.cpp
index 96865d603..ca53ccaa4 100644
--- a/server/Network.cpp
+++ b/server/Network.cpp
@@ -106,53 +106,6 @@ bool Network::hasInvalidUidRanges(const UidRanges& uidRanges) const {
     return false;
 }
 
-int Network::addUsers(const UidRanges& uidRanges) {
-    if (hasInvalidUidRanges(uidRanges)) {
-        return -EINVAL;
-    }
-
-    for (const std::string& interface : mInterfaces) {
-        int ret;
-        if (isVirtual()) {
-            ret = RouteController::addUsersToVirtualNetwork(mNetId, interface.c_str(), mSecure,
-                                                            uidRanges);
-        } else if (isPhysical()) {
-            ret = RouteController::addUsersToPhysicalNetwork(mNetId, interface.c_str(), uidRanges);
-        } else {
-            ALOGE("failed to add users. Invalid network type %d, netId %d", getType(), mNetId);
-            return -EINVAL;
-        }
-        if (ret) {
-            ALOGE("failed to add users on interface %s of netId %u", interface.c_str(), mNetId);
-            return ret;
-        }
-    }
-    mUidRanges.add(uidRanges);
-    return 0;
-}
-
-int Network::removeUsers(const UidRanges& uidRanges) {
-    for (const std::string& interface : mInterfaces) {
-        int ret;
-        if (isVirtual()) {
-            ret = RouteController::removeUsersFromVirtualNetwork(mNetId, interface.c_str(), mSecure,
-                                                                 uidRanges);
-        } else if (isPhysical()) {
-            ret = RouteController::removeUsersFromPhysicalNetwork(mNetId, interface.c_str(),
-                                                                  uidRanges);
-        } else {
-            ALOGE("failed to remove users. Invalid network type %d, netId %d", getType(), mNetId);
-            return -EINVAL;
-        }
-        if (ret) {
-            ALOGE("failed to remove users on interface %s of netId %u", interface.c_str(), mNetId);
-            return ret;
-        }
-    }
-    mUidRanges.remove(uidRanges);
-    return 0;
-}
-
 bool Network::isSecure() const {
     return mSecure;
 }