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

Merge "Expose MacAddress methods to public API" am: 7b98130570

Browse Source 
am: 0688f9b6b1

Change-Id: I1baaf191006cf6fb9fb1e718a755bb829f1cc899
This commit is contained in:
Aaron Huang
2019-10-17 21:07:13 -07:00
committed by android-build-merger
parent 5c31848594 0688f9b6b1
commit c55e2d6d59
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

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

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

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