| commit | 1aae09a655745a155577ea9fc351e0a55263a514 | [log] [tgz] |
|---|---|---|
| author | Maciej Żenczykowski <maze@google.com> | Fri Jun 10 02:50:03 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jun 10 02:50:03 2022 +0000 |
| tree | 74caa917072ebe469f37e47484fa1f96d35384b6 | |
| parent | 4d6a48541f7276212b7cf82d997dd2c6a5ad005a [diff] | |
| parent | d0b897f53190437e7897cde99774515067412fe7 [diff] |
ClatCoordinator: fix erroneous .close() of fds without throw am: 7e8bea3cf9 am: 7c8084c14b am: 7ee54eb694 am: d0b897f531 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2121915 Change-Id: Ib8edd47bef84d67f91df562c99979701d41af893 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/service/src/com/android/server/connectivity/ClatCoordinator.java b/service/src/com/android/server/connectivity/ClatCoordinator.java index ea89be6..498cf63 100644 --- a/service/src/com/android/server/connectivity/ClatCoordinator.java +++ b/service/src/com/android/server/connectivity/ClatCoordinator.java
@@ -596,7 +596,6 @@ try { mNetd.interfaceSetEnableIPv6(tunIface, false /* enabled */); } catch (RemoteException | ServiceSpecificException e) { - maybeCleanUp(tunFd, readSock6, writeSock6); Log.e(TAG, "Disable IPv6 on " + tunIface + " failed: " + e); }