diff options
| author | Bram Bonné <brambonne@google.com> | 2021-03-15 17:22:26 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-03-15 17:22:26 +0000 |
| commit | bfaa78667774fb03d93e0a67f137c592235665a9 (patch) | |
| tree | 1c20340d5d0b7b78efed23008ad0f845e3abccbb | |
| parent | 8c258d8c28d9a1bf1c0c05546b9c6f66ebf26dfc (diff) | |
| parent | 8b266a30b0287705a269bd3f03bc966d796e0e21 (diff) | |
Merge "Revert "Use EUI64 IPv6 link-local address generation only when randomizing MAC"" into pi-dev
| -rw-r--r-- | service/java/com/android/server/wifi/WifiStateMachine.java | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/service/java/com/android/server/wifi/WifiStateMachine.java b/service/java/com/android/server/wifi/WifiStateMachine.java index 55d4384b2..dff2d6077 100644 --- a/service/java/com/android/server/wifi/WifiStateMachine.java +++ b/service/java/com/android/server/wifi/WifiStateMachine.java @@ -4969,17 +4969,12 @@ public class WifiStateMachine extends StateMachine { final WifiConfiguration currentConfig = getCurrentWifiConfiguration(); final boolean isUsingStaticIp = (currentConfig.getIpAssignment() == IpConfiguration.IpAssignment.STATIC); - final boolean isUsingMacRandomization = - currentConfig.macRandomizationSetting - == WifiConfiguration.RANDOMIZATION_PERSISTENT - && isConnectedMacRandomizationEnabled(); if (mVerboseLoggingEnabled) { final String key = currentConfig.configKey(); log("enter ObtainingIpState netId=" + Integer.toString(mLastNetworkId) + " " + key + " " + " roam=" + mIsAutoRoaming - + " static=" + isUsingStaticIp - + " randomMac=" + isUsingMacRandomization); + + " static=" + isUsingStaticIp); } // Send event to CM & network change broadcast @@ -5006,25 +5001,25 @@ public class WifiStateMachine extends StateMachine { if (!TextUtils.isEmpty(mTcpBufferSizes)) { mIpClient.setTcpBufferSizes(mTcpBufferSizes); } - final IpClient.ProvisioningConfiguration.Builder prov; + final IpClient.ProvisioningConfiguration prov; if (!isUsingStaticIp) { prov = IpClient.buildProvisioningConfiguration() .withPreDhcpAction() .withApfCapabilities(mWifiNative.getApfCapabilities(mInterfaceName)) .withNetwork(getCurrentNetwork()) .withDisplayName(currentConfig.SSID) - if (isUsingMacRandomization) { - prov.withRandomMacAddress(); - } + .withRandomMacAddress() + .build(); } else { StaticIpConfiguration staticIpConfig = currentConfig.getStaticIpConfiguration(); prov = IpClient.buildProvisioningConfiguration() .withStaticConfiguration(staticIpConfig) .withApfCapabilities(mWifiNative.getApfCapabilities(mInterfaceName)) .withNetwork(getCurrentNetwork()) - .withDisplayName(currentConfig.SSID); + .withDisplayName(currentConfig.SSID) + .build(); } - mIpClient.startProvisioning(prov.build()); + mIpClient.startProvisioning(prov); // Get Link layer stats so as we get fresh tx packet counters getWifiLinkLayerStats(); } |