From 5b018cfd06be7b22dc2dc428ff5d97d53a7910aa Mon Sep 17 00:00:00 2001 From: Yang Sun Date: Fri, 6 Dec 2024 02:16:45 +0000 Subject: [PATCH] Handle non IPv6 packet in getRaPios Bug: 338061061 Test: atest ThreadNetworkIntegrationTests:android.net.thread.BorderRoutingTest Change-Id: Ia637dc8ec4cca919bd1957148ec2c104ab1895ac --- .../src/android/net/thread/utils/IntegrationTestUtils.kt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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 07d03906d5..316f5704d4 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 @@ object IntegrationTestUtils { 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 }