commit 67b96462cd85dc279c13845351be9dec67d9281f
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Jun 13 02:06:09 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jun 13 02:06:09 2024 +0000
tree 453b81482efe4c1a28295fa61b7b2e45b5e56b9e
parent b9c49b06bc475343c0510655756fd5a0bb45afd4
parent b1f89da5c3cd672848c8ef5c427ff813e0b5eaf8

Merge "Add individual try/catch blocks for ParcelFileDescriptor closure" into main am: b62d79c423 am: b1f89da5c3

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3124594

Change-Id: I3dbb641890f36e1aeb7de0246d2bcf9a34fcd280
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

service/src/com/android/server/connectivity/ClatCoordinator.java

diff --git a/service/src/com/android/server/connectivity/ClatCoordinator.java b/service/src/com/android/server/connectivity/ClatCoordinator.java
index d886182..f333dae 100644
--- a/service/src/com/android/server/connectivity/ClatCoordinator.java
+++ b/service/src/com/android/server/connectivity/ClatCoordinator.java
@@ -683,13 +683,25 @@
             throw new IOException("Failed to start clat ", e);
         } finally {
             if (tunFd != null) {
-                tunFd.close();
+                try {
+                    tunFd.close();
+                } catch (IOException e) {
+                    Log.e(TAG, "Fail to close tun file descriptor " + e);
+                }
             }
             if (readSock6 != null) {
-                readSock6.close();
+                try {
+                    readSock6.close();
+                } catch (IOException e) {
+                    Log.e(TAG, "Fail to close read socket " + e);
+                }
             }
             if (writeSock6 != null) {
-                writeSock6.close();
+                try {
+                    writeSock6.close();
+                } catch (IOException e) {
+                    Log.e(TAG, "Fail to close write socket " + e);
+                }
             }
         }
     }