LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MacAddress: address api review comments

Browse Source 
1) toSafeString() is renamed to toOuiString()
2) toOuiString() returns a String that only contains the first 3 bytes
   of the mac address.

Bug: 70336442
Test: runtest frameworks-net
Change-Id: I798d8fec32dbff5687a682028e5d90eb941f81c1
Merged-In: I798d8fec32dbff5687a682028e5d90eb941f81c1

(cherry pick from commit 3f83b8ad4e)
This commit is contained in:
Hugo Benichi
2017-12-15 10:07:35 +09:00
parent 08faba25e6
commit 1f3ce3f31a
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/net/MacAddress.java
View File

@@ -130,11 +130,12 @@ public final class MacAddress implements Parcelable {
} }
/** /**
* @return a String representation of the OUI part of this MacAddres, * @return a String representation of the OUI part of this MacAddress made of 3 hexadecimal
* with the lower 3 bytes constituting the NIC part replaced with 0. * numbers in [0,ff] joined by ':' characters.
*/ */
public String toSafeString() { public String toOuiString() {
return stringAddrFromLongAddr(mAddr & OUI_MASK); return String.format(
"%02x:%02x:%02x", (mAddr >> 40) & 0xff, (mAddr >> 32) & 0xff, (mAddr >> 24) & 0xff);
} }
@Override @Override

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

@@ -73,18 +73,18 @@ public class MacAddressTest {
} }
@Test @Test
public void testToSafeString() { public void testToOuiString() {
String[][] macs = { String[][] macs = {
{"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:00:00:00"}, {"33:33:aa:bb:cc:dd", "33:33:aa"},
{"06:00:00:00:00:00", "06:00:00:00:00:00"}, {"06:00:00:00:00:00", "06:00:00"},
{"07:00:d3:56:8a:c4", "07:00:d3:00:00:00"} {"07:00:d3:56:8a:c4", "07:00:d3"}
}; };
for (String[] pair : macs) { for (String[] pair : macs) {
String mac = pair[0]; String mac = pair[0];
String expected = pair[1]; String expected = pair[1];
assertEquals(expected, MacAddress.fromString(mac).toSafeString()); assertEquals(expected, MacAddress.fromString(mac).toOuiString());
} }
} }