commit 6be561952ca91e19bc1ba6195ec47e33b43ae7fd
author Pierre Imai <imaipi@google.com> Mon May 16 16:32:17 2016 +0900
committer Pierre Imai <imaipi@google.com> Mon May 16 16:32:17 2016 +0900
tree 021dcb797104bf93210cc96e4e829a00f2ed4909
parent ee335ef2333aaa09290ed8cf4a65f8e6e8b21c46

Fix P2TP VPNs by adding an exception for VPN user.

BUG: 27199751
Change-Id: I1144228febba0c4cce1333fb39ea186d2963ed10

server/NetworkController.cpp

diff --git a/server/NetworkController.cpp b/server/NetworkController.cpp
index 8b1f84e..3364577 100644
--- a/server/NetworkController.cpp
+++ b/server/NetworkController.cpp
@@ -135,7 +135,8 @@
 }
 
 NetworkController::NetworkController() :
-        mDelegateImpl(new NetworkController::DelegateImpl(this)), mDefaultNetId(NETID_UNSET) {
+        mDelegateImpl(new NetworkController::DelegateImpl(this)), mDefaultNetId(NETID_UNSET),
+        mProtectableUsers({AID_VPN}) {
     mNetworks[LOCAL_NET_ID] = new LocalNetwork(LOCAL_NET_ID);
     mNetworks[DUMMY_NET_ID] = new DummyNetwork(DUMMY_NET_ID);
 }