Don't reset a VPN's NetId in the connect() shim.
Change-Id: I0cc6c0e221a40c9100c8f4c0c5e761fce3f9b0ae
diff --git a/server/NetworkController.cpp b/server/NetworkController.cpp
index 3bc0e70..44eb2ef 100644
--- a/server/NetworkController.cpp
+++ b/server/NetworkController.cpp
@@ -111,6 +111,12 @@
return NETID_UNSET;
}
+bool NetworkController::isVirtualNetwork(unsigned netId) const {
+ android::RWLock::AutoRLock lock(mRWLock);
+ Network* network = getNetworkLocked(netId);
+ return network && network->getType() == Network::VIRTUAL;
+}
+
unsigned NetworkController::getNetIdForLocalNetwork() const {
return MIN_NET_ID - 1;
}