commit 0726fec82842883a2332318aa675f7f04670db51
author Lorenzo Colitti <lorenzo@google.com> Tue Jul 26 17:53:50 2016 +0900
committer Lorenzo Colitti <lorenzo@google.com> Thu Jul 28 18:43:22 2016 +0900
tree 97b24f0c01699e649456e87d730561abc88dc2b3
parent 549a0f705849d0a1dcf9de38cbe54edad4a83cd9

Don't close loopback sockets when a VPN connects or entering doze.

Bug: 30186506
Change-Id: I8bae7b004c3bb9f6e9e0db99774a6ff6505578b4

server/VirtualNetwork.cpp

diff --git a/server/VirtualNetwork.cpp b/server/VirtualNetwork.cpp
index 3d83703..6daa50d 100644
--- a/server/VirtualNetwork.cpp
+++ b/server/VirtualNetwork.cpp
@@ -54,7 +54,7 @@
         return -EBADFD;
     }
 
-    if (int ret = sd.destroySockets(uidRanges, protectableUsers)) {
+    if (int ret = sd.destroySockets(uidRanges, protectableUsers, true /* excludeLoopback */)) {
         ALOGE("Failed to close sockets while %s %s to network %d: %s",
               add ? "adding" : "removing", uidRanges.toString().c_str(), mNetId, strerror(-ret));
         return ret;