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

Merge "avoid generating reserved local MACs" am: 464e1b5e6f am: 6fcb2696cd

Browse Source 
am: 4f05f46f13

Change-Id: Icce1e14fae4293d747d0f9a57c99bb52fee31ba0
This commit is contained in:
Oscar Shu
2019-08-23 03:14:04 -07:00
committed by android-build-merger
parent 5048e4a80d 6fcb2696cd
commit ddc3459236
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,6 +20,7 @@ import android.annotation.IntDef;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.UnsupportedAppUsage;
import android.net.wifi.WifiInfo;
import android.os.Parcel;
import android.os.Parcelable;
@@ -364,7 +365,12 @@ public final class MacAddress implements Parcelable {
long addr = r.nextLong() & VALID_LONG_MASK;
addr |= LOCALLY_ASSIGNED_MASK;
addr &= ~MULTICAST_MASK;
return new MacAddress(addr);
MacAddress mac = new MacAddress(addr);
// WifiInfo.DEFAULT_MAC_ADDRESS is being used for another purpose, so do not use it here.
if (mac.toString().equals(WifiInfo.DEFAULT_MAC_ADDRESS)) {
return createRandomUnicastAddress();
}
return mac;
}
/**
@@ -383,7 +389,12 @@ public final class MacAddress implements Parcelable {
long addr = (base.mAddr & OUI_MASK) | (NIC_MASK & r.nextLong());
addr |= LOCALLY_ASSIGNED_MASK;
addr &= ~MULTICAST_MASK;
return new MacAddress(addr);
MacAddress mac = new MacAddress(addr);
// WifiInfo.DEFAULT_MAC_ADDRESS is being used for another purpose, so do not use it here.
if (mac.toString().equals(WifiInfo.DEFAULT_MAC_ADDRESS)) {
return createRandomUnicastAddress(base, r);
}
return mac;
}
// Convenience function for working around the lack of byte literals.