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

Merge changes I798d8fec,I4a2d5866

Browse Source 
am: c5212b6654

Change-Id: Idf04186ece2738c113e2e33c5e7a5133aa437933
This commit is contained in:
Hugo Benichi
2017-12-18 23:57:15 +00:00
committed by android-build-merger
parent 784a690ec7 c5212b6654
commit 99be302c71
3 changed files with 28 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
api/current.txt
View File

@@ -25838,6 +25838,23 @@ package android.net {
enum_constant public static final android.net.LocalSocketAddress.Namespace RESERVED;
}
public final class MacAddress implements android.os.Parcelable {
method public int addressType();
method public int describeContents();
method public static android.net.MacAddress fromBytes(byte[]);
method public static android.net.MacAddress fromString(java.lang.String);
method public boolean isLocallyAssigned();
method public byte[] toByteArray();
method public java.lang.String toOuiString();
method public void writeToParcel(android.os.Parcel, int);
field public static final android.net.MacAddress BROADCAST_ADDRESS;
field public static final android.os.Parcelable.Creator<android.net.MacAddress> CREATOR;
field public static final int TYPE_BROADCAST = 3; // 0x3
field public static final int TYPE_MULTICAST = 2; // 0x2
field public static final int TYPE_UNICAST = 1; // 0x1
field public static final int TYPE_UNKNOWN = 0; // 0x0
}
public class MailTo {
method public java.lang.String getBody();
method public java.lang.String getCc();

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

@@ -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 {
@@ -132,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

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

@@ -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());
}
}