| commit | 44e57eb863c3220fc503ae4f69f6f9d282bb5e9e | [log] [tgz] |
|---|---|---|
| author | Motomu Utsumi <motomuman@google.com> | Mon Mar 13 10:22:00 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Mar 13 10:22:00 2023 +0000 |
| tree | ad173d7bad0c3d2438bc7b618a8902808b948b7c | |
| parent | 1c0b199f61da03625315e1b9918e178cb037ed57 [diff] | |
| parent | 4028f90e82727f05b62db7dbcee4ebb6919f5fe4 [diff] |
Merge "Add comments to explain why mayCloseSockets is called twice." am: 4028f90e82 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2483818 Change-Id: I79c28caf2be92fd33b0a5523c500a58d109109e9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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); }