commit 4028f90e82727f05b62db7dbcee4ebb6919f5fe4
author Motomu Utsumi <motomuman@google.com> Mon Mar 13 09:52:13 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Mar 13 09:52:13 2023 +0000
tree 3d8d7a4e42b01956ac73d945684b1ffbe05fbf70
parent 41c8430b82c656912263ef4e27335d277218375f
parent 6345e4666a6c3b3d12b564d3df40610d46a46805

Merge "Add comments to explain why mayCloseSockets is called twice."

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 7cc4d97..e969cd6 100755
--- a/service/src/com/android/server/ConnectivityService.java
+++ b/service/src/com/android/server/ConnectivityService.java
@@ -8470,6 +8470,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) {
@@ -8483,6 +8484,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);
     }