commit 512302275566b33ade4fc863ed78e4c1439c4f97
author Yang Sun <sunytt@google.com> Fri Dec 06 05:35:26 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Dec 06 05:35:26 2024 +0000
tree 8a3e7b1a87730f0c6982929ed400206e0d0d1b7d
parent 97a4977f839125b1b7b884c818a76049b43d276c
parent 5b018cfd06be7b22dc2dc428ff5d97d53a7910aa

Merge "Handle non IPv6 packet in getRaPios" into main

thread/tests/integration/src/android/net/thread/utils/IntegrationTestUtils.kt

diff --git a/thread/tests/integration/src/android/net/thread/utils/IntegrationTestUtils.kt b/thread/tests/integration/src/android/net/thread/utils/IntegrationTestUtils.kt
index 07d0390..316f570 100644
--- a/thread/tests/integration/src/android/net/thread/utils/IntegrationTestUtils.kt
+++ b/thread/tests/integration/src/android/net/thread/utils/IntegrationTestUtils.kt
@@ -388,7 +388,12 @@
         raMsg ?: return pioList
 
         val buf = ByteBuffer.wrap(raMsg)
-        val ipv6Header = Struct.parse(Ipv6Header::class.java, buf)
+        val ipv6Header = try {
+            Struct.parse(Ipv6Header::class.java, buf)
+        } catch (e: IllegalArgumentException) {
+            // the packet is not IPv6
+            return pioList
+        }
         if (ipv6Header.nextHeader != OsConstants.IPPROTO_ICMPV6.toByte()) {
             return pioList
         }