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

Commit 9d077ecd authored by Hugo Benichi's avatar Hugo Benichi Committed by android-build-merger
Browse files

Merge "Fix bug in MacAddress.fromString()" 

am: cdb84d2f

Change-Id: If4c85f0a5ea259f53f9cffa6eacb58fcde1fd1df
parents 1c578e80 cdb84d2f

core/java/android/net/MacAddress.java

+2 −3
Original line number Original line Diff line number Diff line
@@ -280,9 +280,8 @@ public final class MacAddress implements Parcelable { 
            throw new IllegalArgumentException(addr + " was not a valid MAC address");

            throw new IllegalArgumentException(addr + " was not a valid MAC address");

        }

        }

        long longAddr = 0;

        long longAddr = 0;

        int index = ETHER_ADDR_LEN;

        for (int i = 0; i < parts.length; i++) {

        while (index-- > 0) {

            int x = Integer.valueOf(parts[i], 16);

            int x = Integer.valueOf(parts[index], 16);

            if (x < 0 || 0xff < x) {

            if (x < 0 || 0xff < x) {

                throw new IllegalArgumentException(addr + "was not a valid MAC address");

                throw new IllegalArgumentException(addr + "was not a valid MAC address");

            }

            }

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

+3 −0
Original line number Original line Diff line number Diff line
@@ -161,6 +161,9 @@ public class MacAddressTest { 




            assertEquals(mac, MacAddress.fromString(stringRepr));

            assertEquals(mac, MacAddress.fromString(stringRepr));

            assertEquals(mac, MacAddress.fromBytes(bytesRepr));

            assertEquals(mac, MacAddress.fromBytes(bytesRepr));



            assertEquals(mac, MacAddress.fromString(MacAddress.stringAddrFromByteAddr(bytesRepr)));

            assertEquals(mac, MacAddress.fromBytes(MacAddress.byteAddrFromStringAddr(stringRepr)));

        }

        }

    }

    }