commit 0ea945e919b5ed87707165d2c60e680e233ef12e
author Oscar Shu <xshu@google.com> Fri Aug 23 02:24:15 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri Aug 23 02:24:15 2019 -0700
tree c6ae6cb7faca22ba0c61b24c4bb3a209cf8ae382
parent a784eb71ef0e01b6085b784eab4af520ed7a1cf6
parent da8955aa2a6849e2dc0dab349e27fb4a6667841f

Merge "avoid generating reserved local MACs"
am: da8955aa2a

Change-Id: Ia6d0eb0c5e8101d9c4b4bc63de79157f7d1c2284

core/java/android/net/MacAddress.java

diff --git a/core/java/android/net/MacAddress.java b/core/java/android/net/MacAddress.java
index aa8e010..a809b28 100644
--- a/core/java/android/net/MacAddress.java
+++ b/core/java/android/net/MacAddress.java
@@ -20,6 +20,7 @@
 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 @@
         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 @@
         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.