From d3d76d80639693951808836f2da47e961a099b68 Mon Sep 17 00:00:00 2001
From: Remi NGUYEN VAN <reminv@google.com>
Date: Sat, 16 Jan 2021 00:51:42 +0900
Subject: [PATCH] Remove usage of hidden NetworkUtils from Formatter

Use the Inet4AddressUtils common utility instead.
NetworkUtils is moving to the connectivity module, so its hidden symbols
are not accessible from the framework. Use the Inet4AddressUtils utility
instead.

NetworkUtils.intToInetAddress is also deprecated.

Bug: 174436414
Test: m

Change-Id: Ia4f4de2f23b2e2be056f78cc30259814f9a4dc91
---
 core/java/android/text/format/Formatter.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/java/android/text/format/Formatter.java b/core/java/android/text/format/Formatter.java
index 17d3ae4a7ff04..471f2c2aecaed 100644
--- a/core/java/android/text/format/Formatter.java
+++ b/core/java/android/text/format/Formatter.java
@@ -24,11 +24,12 @@ import android.content.res.Resources;
 import android.icu.text.MeasureFormat;
 import android.icu.util.Measure;
 import android.icu.util.MeasureUnit;
-import android.net.NetworkUtils;
 import android.text.BidiFormatter;
 import android.text.TextUtils;
 import android.view.View;
 
+import com.android.net.module.util.Inet4AddressUtils;
+
 import java.util.Locale;
 
 /**
@@ -207,7 +208,7 @@ public final class Formatter {
      */
     @Deprecated
     public static String formatIpAddress(int ipv4Address) {
-        return NetworkUtils.intToInetAddress(ipv4Address).getHostAddress();
+        return Inet4AddressUtils.intToInet4AddressHTL(ipv4Address).getHostAddress();
     }
 
     private static final int SECONDS_PER_MINUTE = 60;