Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove usage of hidden NetworkUtils from Formatter"

Browse Source
This commit is contained in:
Treehugger Robot
2021-01-18 11:01:06 +00:00
committed by Gerrit Code Review
parent 21d36ec4f5 d3d76d8063
commit ea47f9ee6c
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/text/format/Formatter.java
View File

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