diff options
| author | Aaron Huang <huangaaron@google.com> | 2019-10-17 21:20:51 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-10-17 21:20:51 -0700 |
| commit | 8adf1652b9bf03b02b994afb3c02fc75251b2c7f (patch) | |
| tree | 696b718d2c949ebc337c88c99fee872d74025180 /core/java/android | |
| parent | 6d04d658dce6e893fc1e4465301ff55030a3e5e0 (diff) | |
| parent | 93cc10ac81f4a09cebd3123be7130bd3b175aa8e (diff) | |
Merge "Expose MacAddress methods to public API" am: 7b98130570 am: 0688f9b6b1 am: c55e2d6d59
am: 93cc10ac81
Change-Id: Ie117595096175ddb0affaa36d5f287a533e99eb5
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/net/MacAddress.java | 2 |
1 files changed, 0 insertions, 2 deletions
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(); |