From db7d961fb3ded95a29c413f32d03da8dda8a7e3a Mon Sep 17 00:00:00 2001
From: Patrick Rohr <prohr@google.com>
Date: Mon, 14 Apr 2025 13:11:30 -0700
Subject: [PATCH] Use HexDump instead of Kotlin Experimental API

Test: TH
Flag: EXEMPT mainline
Bug: 1000001
Change-Id: I5d0e4989194eecc90e00b1903f8458d9df098ff4
---
 .../devicetests/com/android/testutils/PacketBuilderUtils.kt  | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/staticlibs/testutils/devicetests/com/android/testutils/PacketBuilderUtils.kt b/staticlibs/testutils/devicetests/com/android/testutils/PacketBuilderUtils.kt
index f7dabcdaff..41f43e84f9 100644
--- a/staticlibs/testutils/devicetests/com/android/testutils/PacketBuilderUtils.kt
+++ b/staticlibs/testutils/devicetests/com/android/testutils/PacketBuilderUtils.kt
@@ -21,6 +21,7 @@ package com.android.testutils
 
 import android.net.IpPrefix
 import android.net.MacAddress
+import com.android.internal.util.HexDump
 import com.android.net.module.util.IpUtils
 import java.io.ByteArrayOutputStream
 import java.net.Inet4Address
@@ -68,10 +69,8 @@ class PacketBuilder(outerPacket: Packet, innerPacket: Packet) {
         return payload!!.bytes
     }
 
-    // For ByteArray.toHexString
-    @kotlin.ExperimentalStdlibApi
     override fun toString(): String {
-        return build().toHexString()
+        return HexDump.toHexString(build())
     }
 }