Add networkCreate API. Deprecate networkCreate[Physical/Vpn]

OEMs need VPN type information in Netd for customization. According to
stable AIDL rules, Netd can neither extend parameters in the existing
networkCreateVpn, nor add a new API with the identical name (function
overloading). Thus, add an extensible API which can create physical
network, virtual network, and so on. Deprecate networkCreatePhysical
and networkCreateVpn.

Bug: 171872481
Test: atest
Change-Id: I9094593c902d91d90a8210960c608f0a50f163ff

1 files changed, 6 insertions, 1 deletions

diff --git a/server/NetworkController.cpp b/server/NetworkController.cpp
index 1d68b201..ff52db5b 100644
--- a/server/NetworkController.cpp
+++ b/server/NetworkController.cpp
@@ -437,7 +437,7 @@ int NetworkController::createPhysicalOemNetwork(Permission permission, unsigned
     return ret;
 }
 
-int NetworkController::createVirtualNetwork(unsigned netId, bool secure) {
+int NetworkController::createVirtualNetwork(unsigned netId, bool secure, NativeVpnType vpnType) {
     ScopedWLock lock(mRWLock);
 
     if (!(MIN_NET_ID <= netId && netId <= MAX_NET_ID)) {
@@ -450,6 +450,11 @@ int NetworkController::createVirtualNetwork(unsigned netId, bool secure) {
         return -EEXIST;
     }
 
+    if (vpnType < NativeVpnType::SERVICE || NativeVpnType::OEM < vpnType) {
+        ALOGE("invalid vpnType %d", static_cast<int>(vpnType));
+        return -EINVAL;
+    }
+
     if (int ret = modifyFallthroughLocked(netId, true)) {
         return ret;
     }