Merge "Fix bug in MacAddress.fromString()"

am: cdb84d2fc7

Change-Id: If4c85f0a5ea259f53f9cffa6eacb58fcde1fd1df
This commit is contained in:
Hugo Benichi
2017-12-05 09:47:50 +00:00
committed by android-build-merger
2 changed files with 5 additions and 3 deletions

View File

@@ -280,9 +280,8 @@ public final class MacAddress implements Parcelable {
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");
}