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 "Use separate catch for getTcpKeepalivePacket"

Browse source
This commit is contained in:
Remi NGUYEN VAN 2022-03-23 09:24:32 +00:00 • committed by Gerrit Code Review
commit cc49988549
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
service/src/com/android/server/connectivity/TcpKeepaliveController.java
View file

@ -124,7 +124,12 @@ public class TcpKeepaliveController {
final TcpKeepalivePacketDataParcelable tcpDetails = switchToRepairMode(fd);
// TODO: consider building a TcpKeepalivePacketData directly from switchToRepairMode
return fromStableParcelable(tcpDetails);
} catch (InvalidPacketException | InvalidSocketException e) {
// Use separate catch blocks: a combined catch would get wrongly optimized by R8
// (b/226127213).
} catch (InvalidSocketException e) {
switchOutOfRepairMode(fd);
throw e;
} catch (InvalidPacketException e) {
switchOutOfRepairMode(fd);
throw e;
}