commit a888b572c2be29fa38d366c28945961305c6c617
author Patrick Rohr <prohr@google.com> Fri Jul 29 04:02:18 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jul 29 04:02:18 2022 +0000
tree 9047beaeaccd3a06313deeb216053f1330ecbe25
parent 41a1ead4c0446497a9838bfb29a2743ef32d4eec
parent 4a76563701385b4fbd70e54e83c528e60cfd1cb1

RaResponder: log instead of throw exception am: 12eeb3939b

Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/2168407

Change-Id: I47b04ff1f405838427b3217ddf83b7e02e86fc85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

staticlibs/testutils/devicetests/com/android/testutils/RouterAdvertisementResponder.java

diff --git a/staticlibs/testutils/devicetests/com/android/testutils/RouterAdvertisementResponder.java b/staticlibs/testutils/devicetests/com/android/testutils/RouterAdvertisementResponder.java
index 21cb149..478161d 100644
--- a/staticlibs/testutils/devicetests/com/android/testutils/RouterAdvertisementResponder.java
+++ b/staticlibs/testutils/devicetests/com/android/testutils/RouterAdvertisementResponder.java
@@ -35,6 +35,7 @@
 import android.net.LinkAddress;
 import android.net.MacAddress;
 import android.util.ArrayMap;
+import android.util.Log;
 import android.util.Pair;
 
 import com.android.net.module.util.Ipv6Utils;
@@ -130,7 +131,9 @@
         try {
             reader.sendResponse(buffer);
         } catch (IOException e) {
-            throw new RuntimeException("Failed to send buffer.");
+            // Throwing an exception here will crash the test process. Let's stick to logging, as
+            // the test will fail either way.
+            Log.e(TAG, "Failed to send buffer", e);
         }
     }