diff options
| author | 2019-10-17 21:07:13 -0700 | |
|---|---|---|
| committer | 2019-10-17 21:07:13 -0700 | |
| commit | c55e2d6d59a8ba68b24697511362839c7122a060 (patch) | |
| tree | 09cd9875f2f37c033f6b773996019cf317d576bd | |
| parent | 5c31848594207ece1c0c08efa3d7b0223f71b4f3 (diff) | |
| parent | 0688f9b6b13dd26ad8bda9390003b54a048bbf31 (diff) | |
Merge "Expose MacAddress methods to public API" am: 7b98130570
am: 0688f9b6b1
Change-Id: I1baaf191006cf6fb9fb1e718a755bb829f1cc899
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/net/MacAddress.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index c396d74116b6..bcbdc3cf6053 100644 --- a/api/current.txt +++ b/api/current.txt @@ -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); diff --git a/core/java/android/net/MacAddress.java b/core/java/android/net/MacAddress.java index 2cf2a6514e77..87295142bec4 100644 --- a/core/java/android/net/MacAddress.java +++ b/core/java/android/net/MacAddress.java @@ -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(); |