commit f5cf390e416e964b915b8dcf3339230c93756547
author Hugo Benichi <hugobenichi@google.com> Tue Dec 05 10:09:35 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Dec 05 10:09:35 2017 +0000
tree 1bb260773f0c7de598fcbbd36e5c88b7927427e2
parent 814f73f81a942d6e92a9f376f02416730203416a
parent 5d2bd6bf0cb9f20dfa92e56d4eeeea530b6565b2

Merge "Fix bug in MacAddress.fromString()" am: cdb84d2fc7 am: 9d077ecd9d
am: 5d2bd6bf0c

Change-Id: I7df23a45618825b874658ccbbf1d1fda6b164954

core/java/android/net/MacAddress.java

diff --git a/core/java/android/net/MacAddress.java b/core/java/android/net/MacAddress.java
index 441fad8..5620a62 100644
--- a/core/java/android/net/MacAddress.java
+++ b/core/java/android/net/MacAddress.java
@@ -280,9 +280,8 @@
             throw new IllegalArgumentException(addr + " was not a valid MAC address");
         }
         long longAddr = 0;
-        int index = ETHER_ADDR_LEN;
-        while (index-- > 0) {
-            int x = Integer.valueOf(parts[index], 16);
+        for (int i = 0; i < parts.length; i++) {
+            int x = Integer.valueOf(parts[i], 16);
             if (x < 0 || 0xff < x) {
                 throw new IllegalArgumentException(addr + "was not a valid MAC address");
             }

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

diff --git a/tests/net/java/android/net/MacAddressTest.java b/tests/net/java/android/net/MacAddressTest.java
index 772ff8d..558dbb6 100644
--- a/tests/net/java/android/net/MacAddressTest.java
+++ b/tests/net/java/android/net/MacAddressTest.java
@@ -161,6 +161,9 @@
 
             assertEquals(mac, MacAddress.fromString(stringRepr));
             assertEquals(mac, MacAddress.fromBytes(bytesRepr));
+
+            assertEquals(mac, MacAddress.fromString(MacAddress.stringAddrFromByteAddr(bytesRepr)));
+            assertEquals(mac, MacAddress.fromBytes(MacAddress.byteAddrFromStringAddr(stringRepr)));
         }
     }