| commit | 692fbe7f547c4e6b7379f44d7c9534f285fb1b44 | [log] [tgz] |
|---|---|---|
| author | Yang Sun <sunytt@google.com> | Fri Dec 06 06:28:57 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Dec 06 06:28:57 2024 +0000 |
| tree | 7803a319b5ec4ea1254bf5c482a0652cf9d1763c | |
| parent | 9a4097702340a1e2e999e4de32ea47ea0d5abfe9 [diff] | |
| parent | bb2b79cb9d3984553d8fba001822e9fa735893c5 [diff] |
Merge "Handle non IPv6 packet in getRaPios" into main am: 5123022755 am: bb2b79cb9d Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3394001 Change-Id: I67d973268f0be94337f675f525070adce43f4674 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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 }