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

Commit 07481ccd authored by Jesse Wilson's avatar Jesse Wilson
Browse files

Deprecate a method that formats only IPv4 addresses. 

Anyone calling this method is probably storing IP addresses
in an int, which doesn't make sense anymore.

Change-Id: Iba535b66f6cff47ce07b5ecc6427e3b2fd846998
parent 089dc718

api/current.xml

+2 −2
Original line number Original line Diff line number Diff line
@@ -190640,10 +190640,10 @@ 
 synchronized="false"

 synchronized="false"

 static="true"

 static="true"

 final="false"

 final="false"

 deprecated="not deprecated"

 deprecated="deprecated"

 visibility="public"

 visibility="public"

>

>

<parameter name="addr" type="int">

<parameter name="ipv4Address" type="int">

</parameter>

</parameter>

</method>

</method>

<method name="formatShortFileSize"

<method name="formatShortFileSize"

core/java/android/net/NetworkUtils.java

+4 −9
Original line number Original line Diff line number Diff line
@@ -125,24 +125,19 @@ public class NetworkUtils { 




    /**

    /**

     * Convert a IPv4 address from an integer to an InetAddress.

     * Convert a IPv4 address from an integer to an InetAddress.

     * @param hostAddr is an Int corresponding to the IPv4 address in network byte order

     * @param hostAddress an int corresponding to the IPv4 address in network byte order

     * @return the IP address as an {@code InetAddress}, returns null if

     * unable to convert or if the int is an invalid address.

     */

     */

    public static InetAddress intToInetAddress(int hostAddress) {

    public static InetAddress intToInetAddress(int hostAddress) {

        InetAddress inetAddress;

        byte[] addressBytes = { (byte)(0xff & hostAddress),

        byte[] addressBytes = { (byte)(0xff & hostAddress),

                                (byte)(0xff & (hostAddress >> 8)),

                                (byte)(0xff & (hostAddress >> 8)),

                                (byte)(0xff & (hostAddress >> 16)),

                                (byte)(0xff & (hostAddress >> 16)),

                                (byte)(0xff & (hostAddress >> 24)) };

                                (byte)(0xff & (hostAddress >> 24)) };





        try {

        try {

           inetAddress = InetAddress.getByAddress(addressBytes);

           return InetAddress.getByAddress(addressBytes);

        } catch (UnknownHostException e) {

        } catch (UnknownHostException e) {

           return null;

           throw new AssertionError();

        }

        }



        return inetAddress;

    }

    }





    /**

    /**

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

+18 −17
Original line number Original line Diff line number Diff line
@@ -17,10 +17,11 @@ 
package android.text.format;

package android.text.format;





import android.content.Context;

import android.content.Context;

import android.net.NetworkUtils;





/**

/**

 * Utility class to aid in formatting common values that are not covered

 * Utility class to aid in formatting common values that are not covered

 * by the standard java.util.Formatter.

 * by {@link java.util.Formatter}

 */

 */

public final class Formatter {

public final class Formatter {
@@ -28,8 +29,8 @@ public final class Formatter { 
     * Formats a content size to be in the form of bytes, kilobytes, megabytes, etc

     * Formats a content size to be in the form of bytes, kilobytes, megabytes, etc

     *

     *

     * @param context Context to use to load the localized units

     * @param context Context to use to load the localized units

     * @param number size value to be formated

     * @param number size value to be formatted

     * @return formated string with the number

     * @return formatted string with the number

     */

     */

    public static String formatFileSize(Context context, long number) {

    public static String formatFileSize(Context context, long number) {

        return formatFileSize(context, number, false);

        return formatFileSize(context, number, false);
@@ -37,7 +38,7 @@ public final class Formatter { 




    /**

    /**

     * Like {@link #formatFileSize}, but trying to generate shorter numbers

     * Like {@link #formatFileSize}, but trying to generate shorter numbers

     * (showing fewer digits of precisin).

     * (showing fewer digits of precision).

     */

     */

    public static String formatShortFileSize(Context context, long number) {

    public static String formatShortFileSize(Context context, long number) {

        return formatFileSize(context, number, true);

        return formatFileSize(context, number, true);
@@ -98,15 +99,15 @@ public final class Formatter { 
     * the IP address.  The IP address is expected to be in little-endian format (LSB first). That

     * the IP address.  The IP address is expected to be in little-endian format (LSB first). That

     * is, 0x01020304 will return "4.3.2.1".

     * is, 0x01020304 will return "4.3.2.1".

     *

     *

     * @param addr the IP address as a packed integer with LSB first.

     * @param ipv4Address the IP address as a packed integer with LSB first.

     * @return string with canonical IP address format.

     * @return string with canonical IP address format.

     *

     * @deprecated this method doesn't support IPv6 addresses. Prefer {@link

     *     java.net.InetAddress#getHostAddress()}, which supports both IPv4 and

     *     IPv6 addresses.

     */

     */

    public static String formatIpAddress(int addr) {

    @Deprecated

        StringBuffer buf = new StringBuffer();

    public static String formatIpAddress(int ipv4Address) {

        buf.append(addr  & 0xff).append('.').

        return NetworkUtils.intToInetAddress(ipv4Address).getHostAddress();

            append((addr >>>= 8) & 0xff).append('.').

            append((addr >>>= 8) & 0xff).append('.').

            append((addr >>>= 8) & 0xff);

        return buf.toString();

    }

    }

}
 
}