LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Expose MacAddress methods to public API" am: db4e0d3bcf

Browse Source 
am: 1d06e0b1fb

Change-Id: I1baaf191006cf6fb9fb1e718a755bb829f1cc899
This commit is contained in:
Aaron Huang
2019-10-17 21:07:13 -07:00
committed by android-build-merger
parent 1e53cc62bb 1d06e0b1fb
commit e0cd0f25ac
1 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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