Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit af052be2 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove usage of hidden NetworkUtils from Formatter" am: ea47f9ee am:... 

Merge "Remove usage of hidden NetworkUtils from Formatter" am: ea47f9ee am: 4d36fe85 am: 7e54a837

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If7d87e3254064bfb2ceea1317c577b3e910d0452
parents 954da967 7e54a837

core/java/android/text/format/Formatter.java

+3 −2
Original line number Diff line number Diff line
@@ -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;