From 3f33d23522338e98449035112510be7118854628 Mon Sep 17 00:00:00 2001 From: Hugo Benichi Date: Tue, 5 Dec 2017 10:30:31 +0900 Subject: [PATCH 1/2] Expose the MacAddress class in the api Test: built, flashed, $ runtest frameworks-net Bug: 69390696 Change-Id: Ica5efdf5ffe8ad2500a87f574508a2bcd074b33d Merged-In: Ica5efdf5ffe8ad2500a87f574508a2bcd074b33d (cherry picked from commit d411cf61ed5b948aaf6f6234217d6c6999c35159) --- core/java/android/net/MacAddress.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/core/java/android/net/MacAddress.java b/core/java/android/net/MacAddress.java index 5620a627df..34588614fc 100644 --- a/core/java/android/net/MacAddress.java +++ b/core/java/android/net/MacAddress.java @@ -33,8 +33,6 @@ import java.util.Random; * * This class only supports 48 bits long addresses and does not support 64 bits long addresses. * Instances of this class are immutable. - * - * @hide */ public final class MacAddress implements Parcelable { From 3f83b8ad4e50b8ac75cf937bba7ff46c9c6c73c1 Mon Sep 17 00:00:00 2001 From: Hugo Benichi Date: Fri, 15 Dec 2017 10:07:35 +0900 Subject: [PATCH 2/2] MacAddress: address api review comments 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 --- core/java/android/net/MacAddress.java | 9 +++++---- tests/net/java/android/net/MacAddressTest.java | 12 ++++++------ 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/core/java/android/net/MacAddress.java b/core/java/android/net/MacAddress.java index 34588614fc..d6992aaede 100644 --- a/core/java/android/net/MacAddress.java +++ b/core/java/android/net/MacAddress.java @@ -130,11 +130,12 @@ public final class MacAddress implements Parcelable { } /** - * @return a String representation of the OUI part of this MacAddres, - * with the lower 3 bytes constituting the NIC part replaced with 0. + * @return a String representation of the OUI part of this MacAddress made of 3 hexadecimal + * numbers in [0,ff] joined by ':' characters. */ - public String toSafeString() { - return stringAddrFromLongAddr(mAddr & OUI_MASK); + public String toOuiString() { + return String.format( + "%02x:%02x:%02x", (mAddr >> 40) & 0xff, (mAddr >> 32) & 0xff, (mAddr >> 24) & 0xff); } @Override diff --git a/tests/net/java/android/net/MacAddressTest.java b/tests/net/java/android/net/MacAddressTest.java index 558dbb69ae..473dc538f0 100644 --- a/tests/net/java/android/net/MacAddressTest.java +++ b/tests/net/java/android/net/MacAddressTest.java @@ -73,18 +73,18 @@ public class MacAddressTest { } @Test - public void testToSafeString() { + public void testToOuiString() { String[][] macs = { - {"07:00:d3:56:8a:c4", "07:00:d3:00:00:00"}, - {"33:33:aa:bb:cc:dd", "33:33:aa:00:00:00"}, - {"06:00:00:00:00:00", "06:00:00:00:00:00"}, - {"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"}, + {"06:00:00:00:00:00", "06:00:00"}, + {"07:00:d3:56:8a:c4", "07:00:d3"} }; for (String[] pair : macs) { String mac = pair[0]; String expected = pair[1]; - assertEquals(expected, MacAddress.fromString(mac).toSafeString()); + assertEquals(expected, MacAddress.fromString(mac).toOuiString()); } }