Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix bug in MacAddress.fromString()"

Browse Source
This commit is contained in:
Treehugger Robot
2017-12-05 09:38:42 +00:00
committed by Gerrit Code Review
parent 1a2a45667b d2c5b1925b
commit cdb84d2fc7
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/net/MacAddress.java
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");
}

3
tests/net/java/android/net/MacAddressTest.java
View File

@@ -161,6 +161,9 @@ public class MacAddressTest {
assertEquals(mac, MacAddress.fromString(stringRepr));
assertEquals(mac, MacAddress.fromBytes(bytesRepr));
assertEquals(mac, MacAddress.fromString(MacAddress.stringAddrFromByteAddr(bytesRepr)));
assertEquals(mac, MacAddress.fromBytes(MacAddress.byteAddrFromStringAddr(stringRepr)));
}
}