commit cf3568c82b5befb5f625c2617e152557b9fb2946
author Remi NGUYEN VAN <reminv@google.com> Wed Mar 23 09:43:07 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Mar 23 09:43:07 2022 +0000
tree 0e656bae345354d76749c3719065b8e476f57bdf
parent fc91e9d11f17d8ba0ca08ea1f4e1c277d8f91d60
parent cc499885490129eb174a8eaa83735a94b682f437

Merge "Use separate catch for getTcpKeepalivePacket" am: cc49988549

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

Change-Id: I39d18e945e475aeecda1b0b4df9c6925977cf622

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

diff --git a/service/src/com/android/server/connectivity/TcpKeepaliveController.java b/service/src/com/android/server/connectivity/TcpKeepaliveController.java
index acfbb3c..a9cb2fa 100644
--- a/service/src/com/android/server/connectivity/TcpKeepaliveController.java
+++ b/service/src/com/android/server/connectivity/TcpKeepaliveController.java
@@ -124,7 +124,12 @@
             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;
         }