commit 070b2d296de30e3dbc68c21f542acb1f2914d870
author Sreeram Ramachandran <sreeram@google.com> Fri Jul 11 17:06:12 2014 -0700
committer Sreeram Ramachandran <sreeram@google.com> Fri Jul 11 17:06:12 2014 -0700
tree 0fc8463af9e13aeb965bbd5e6bc575c1888f17ed
parent a69d9472ac48d4e09f049fb740e60b7217e03861

Don't reset a VPN's NetId in the connect() shim.

Change-Id: I0cc6c0e221a40c9100c8f4c0c5e761fce3f9b0ae

server/NetworkController.cpp

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;
 }