joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Treehugger Robot 2024-06-13 01:54:03 +00:00 • committed by Gerrit Code Review
commit b62d79c423
1 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

18
service/src/com/android/server/connectivity/ClatCoordinator.java
View file

@ -683,13 +683,25 @@ public class ClatCoordinator {
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);
}
}
}
}