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

Commit 4674242d authored by Hugo Benichi's avatar Hugo Benichi Committed by Android (Google) Code Review
Browse files

Merge "MacAddress: address api review comments"

parents 9f66eb4f 824565df

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -26226,7 +26226,7 @@ package android.net { 
    method public static android.net.MacAddress fromString(java.lang.String);

    method public boolean isLocallyAssigned();

    method public byte[] toByteArray();

    method public java.lang.String toSafeString();

    method public java.lang.String toOuiString();

    method public void writeToParcel(android.os.Parcel, int);

    field public static final android.net.MacAddress BROADCAST_ADDRESS;

    field public static final android.os.Parcelable.Creator<android.net.MacAddress> CREATOR;

core/java/android/net/MacAddress.java

+5 −4
Original line number Diff line number Diff line
@@ -130,11 +130,12 @@ public final class MacAddress implements Parcelable { 
    }



    /**

     * @return a String representation of the OUI part of this MacAddres,

     * with the lower 3 bytes constituting the NIC part replaced with 0.

     * @return a String representation of the OUI part of this MacAddress made of 3 hexadecimal

     * numbers in [0,ff] joined by ':' characters.

     */

    public String toSafeString() {

        return stringAddrFromLongAddr(mAddr & OUI_MASK);

    public String toOuiString() {

        return String.format(

                "%02x:%02x:%02x", (mAddr >> 40) & 0xff, (mAddr >> 32) & 0xff, (mAddr >> 24) & 0xff);

    }



    @Override

tests/net/java/android/net/MacAddressTest.java

+6 −6
Original line number Diff line number Diff line
@@ -73,18 +73,18 @@ public class MacAddressTest { 
    }



    @Test

    public void testToSafeString() {

    public void testToOuiString() {

        String[][] macs = {

            {"07:00:d3:56:8a:c4", "07:00:d3:00:00:00"},

            {"33:33:aa:bb:cc:dd", "33:33:aa:00:00:00"},

            {"06:00:00:00:00:00", "06:00:00:00:00:00"},

            {"07:00:d3:56:8a:c4", "07:00:d3:00:00:00"}

            {"07:00:d3:56:8a:c4", "07:00:d3"},

            {"33:33:aa:bb:cc:dd", "33:33:aa"},

            {"06:00:00:00:00:00", "06:00:00"},

            {"07:00:d3:56:8a:c4", "07:00:d3"}

        };



        for (String[] pair : macs) {

            String mac = pair[0];

            String expected = pair[1];

            assertEquals(expected, MacAddress.fromString(mac).toSafeString());

            assertEquals(expected, MacAddress.fromString(mac).toOuiString());

        }

    }