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" am: ea47f9ee6c am: 4d36fe858c am: 7e54a837d2

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552501

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If7d87e3254064bfb2ceea1317c577b3e910d0452
This commit is contained in:
Treehugger Robot
2021-01-18 13:19:42 +00:00
committed by Automerger Merge Worker
parent 954da96753 7e54a837d2
commit af052be27c
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.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;