Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f8574706 authored Oct 03, 2019 by Aaron Huang

Expose MacAddress methods to public API

To support mainline modules, adding the methods which
are used by wifi.

Bug: 139268426
Bug: 135998869
Bug: 138306002
Test: atest android.net.cts
      atest android.net.wifi.cts
      atest FrameworksNetTests
      atest NetworkStackTests
      ./frameworks/opt/net/wifi/tests/wifitests/runtests.sh

Change-Id: I49856863c15b6b3b59aa867a77b0f137003149ef

parent 37ee696d

api/current.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -28766,7 +28766,9 @@ package android.net {
		method @NonNull public static android.net.MacAddress fromBytes(@NonNull byte[]);
		method @NonNull public static android.net.MacAddress fromString(@NonNull String);
		method public int getAddressType();
		method @Nullable public java.net.Inet6Address getLinkLocalIpv6FromEui48Mac();
		method public boolean isLocallyAssigned();
		method public boolean matches(@NonNull android.net.MacAddress, @NonNull android.net.MacAddress);
		method @NonNull public byte[] toByteArray();
		method @NonNull public String toOuiString();
		method public void writeToParcel(android.os.Parcel, int);

core/java/android/net/MacAddress.java

+0 −2

Original line number	Diff line number	Diff line
		@@ -416,7 +416,6 @@ public final class MacAddress implements Parcelable {
		* @param mask MacAddress representing the mask to use during comparison.
		* @return true if this MAC Address matches the given range.
		*
		* @hide
		*/
		public boolean matches(@NonNull MacAddress baseAddress, @NonNull MacAddress mask) {
		Preconditions.checkNotNull(baseAddress);
		@@ -430,7 +429,6 @@ public final class MacAddress implements Parcelable {
		* IPv6 address per RFC 4862.
		*
		* @return A link-local Inet6Address constructed from the MAC address.
		* @hide
		*/
		public @Nullable Inet6Address getLinkLocalIpv6FromEui48Mac() {
		byte[] macEui48Bytes = toByteArray();