commit 9746e6f3462bcd3a685b7dfec956b73260af400e
author Remi NGUYEN VAN <reminv@google.com> Wed Mar 23 09:59:46 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Mar 23 09:59:46 2022 +0000
tree a3d0c654c50574c45c7952ea3a83c34c36aba151
parent 04eb319ab6e346fdf2658285c067efa1ab3b9324
parent c98c1c1e7e0ba81290775b7bfa8c28ce866ed34b

Merge "Use separate catch for getTcpKeepalivePacket" am: cc49988549 am: c98c1c1e7e

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

Change-Id: I22b51221894c8e5eb09ee9ce0694bbb2a7a37b9e

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