commit 6345e4666a6c3b3d12b564d3df40610d46a46805
author Motomu Utsumi <motomuman@google.com> Mon Mar 13 13:24:50 2023 +0900
committer Motomu Utsumi <motomuman@google.com> Mon Mar 13 13:24:50 2023 +0900
tree 04975931469ca0c62fc590b2e2351ada67cde785
parent 259ccb34a442467e000b6cf5428ac90d32e5b176

Add comments to explain why mayCloseSockets is called twice.

Test: m
Change-Id: Ide8a5b649c7bda26c41e3d11a5071eb1af7ae0a2

service/src/com/android/server/ConnectivityService.java

diff --git a/service/src/com/android/server/ConnectivityService.java b/service/src/com/android/server/ConnectivityService.java
index 5f51971..fa2efb6 100755
--- a/service/src/com/android/server/ConnectivityService.java
+++ b/service/src/com/android/server/ConnectivityService.java
@@ -8467,6 +8467,7 @@
         exemptUids[1] = nai.networkCapabilities.getOwnerUid();
         UidRangeParcel[] ranges = toUidRangeStableParcels(uidRanges);
 
+        // Close sockets before modifying uid ranges so that RST packets can reach to the server.
         maybeCloseSockets(nai, ranges, exemptUids);
         try {
             if (add) {
@@ -8480,6 +8481,7 @@
             loge("Exception while " + (add ? "adding" : "removing") + " uid ranges " + uidRanges +
                     " on netId " + nai.network.netId + ". " + e);
         }
+        // Close sockets that established connection while requesting netd.
         maybeCloseSockets(nai, ranges, exemptUids);
     }