From b1bf756c8c9df0d2f0d7f101fabe6875ec2d9347 Mon Sep 17 00:00:00 2001 From: Aaron Huang Date: Thu, 25 Feb 2021 17:53:36 +0800 Subject: [PATCH] Use the net-utils-device-common version of HexDump KeepaliveTracker is included in ConnectivityService mainline module and it will not be able to access internal util class com.android.internal.util.HexDump. Use the HexDump defined in net-utils-device-common to remove dependency on internal util class. Bug: 177046265 Test: FrameworksNetTests Change-Id: I1f5a6a749106b98e2baf22d6a290dcf8b51a6c36 --- .../java/com/android/server/connectivity/KeepaliveTracker.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/connectivity/KeepaliveTracker.java b/services/core/java/com/android/server/connectivity/KeepaliveTracker.java index 34d9ccc15d..7b20ded192 100644 --- a/services/core/java/com/android/server/connectivity/KeepaliveTracker.java +++ b/services/core/java/com/android/server/connectivity/KeepaliveTracker.java @@ -57,8 +57,8 @@ import android.util.Log; import android.util.Pair; import com.android.internal.R; -import com.android.internal.util.HexDump; import com.android.internal.util.IndentingPrintWriter; +import com.android.net.module.util.HexDump; import com.android.net.module.util.IpUtils; import java.io.FileDescriptor;