commit b62d79c423570421e9813bf0db2dbd7c981a3c71
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Jun 13 01:54:03 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jun 13 01:54:03 2024 +0000
tree 0caae09129625c8484ce9fbd6279cfd2ca91e474
parent 99f1201b0f2febdc73f0397f83d9364feb0db021
parent b41e4f6326d3ca13ec0bd431261a6993face6351

Merge "Add individual try/catch blocks for ParcelFileDescriptor closure" into main

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);
+                }
             }
         }
     }