summaryrefslogtreecommitdiffstats
path: root/service/java/com/android/server/wifi/WifiConfigManager.java
diff options
context:
space:
mode:
authorMukesh Agrawal <quiche@google.com>2018-03-29 22:25:13 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2018-03-29 22:25:13 +0000
commit453bfc87609e12da3e831caca0e206eadaf8f186 (patch)
tree98b2b472c09dfcde3ec668fd85aae79840b7808c /service/java/com/android/server/wifi/WifiConfigManager.java
parentc4002658545b95d0f7f1686e925072518416a78e (diff)
parentde108ed648e6aeed94c61ac9bb893181e83dcb4b (diff)
downloadandroid_frameworks_opt_net_wifi-453bfc87609e12da3e831caca0e206eadaf8f186.tar.gz
android_frameworks_opt_net_wifi-453bfc87609e12da3e831caca0e206eadaf8f186.tar.bz2
android_frameworks_opt_net_wifi-453bfc87609e12da3e831caca0e206eadaf8f186.zip
Merge "Use "02:00:00:00:00:00" as default invalid mac" into pi-dev
Diffstat (limited to 'service/java/com/android/server/wifi/WifiConfigManager.java')
-rw-r--r--service/java/com/android/server/wifi/WifiConfigManager.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/service/java/com/android/server/wifi/WifiConfigManager.java b/service/java/com/android/server/wifi/WifiConfigManager.java
index 5fb1eac10..336ebbd16 100644
--- a/service/java/com/android/server/wifi/WifiConfigManager.java
+++ b/service/java/com/android/server/wifi/WifiConfigManager.java
@@ -431,11 +431,12 @@ public class WifiConfigManager {
/**
* Helper method to mask randomized MAC address from the provided WifiConfiguration Object.
* This is needed when the network configurations are being requested via the public
- * WifiManager API's. This method puts "0:0:0:0:0:0" as the MAC address.
+ * WifiManager API's. This method puts "02:00:00:00:00:00" as the MAC address.
* @param configuration WifiConfiguration to hide the MAC address
*/
private void maskRandomizedMacAddressInWifiConfiguration(WifiConfiguration configuration) {
- configuration.setRandomizedMacAddress(MacAddress.ALL_ZEROS_ADDRESS);
+ MacAddress defaultMac = MacAddress.fromString(WifiInfo.DEFAULT_MAC_ADDRESS);
+ configuration.setRandomizedMacAddress(defaultMac);
}
/**