diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-03-05 14:32:27 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-03-05 14:32:27 +0000 |
| commit | 8c258d8c28d9a1bf1c0c05546b9c6f66ebf26dfc (patch) | |
| tree | a06f6f1dba8a83b9275af6dbffe194d6e3690704 | |
| parent | 4abeb78af5e46be849b36e11cf167cac1eec28f4 (diff) | |
| parent | eac13f7677f5d48720eaa446001236436b2d5471 (diff) | |
Merge "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, 12 insertions, 7 deletions
diff --git a/service/java/com/android/server/wifi/WifiStateMachine.java b/service/java/com/android/server/wifi/WifiStateMachine.java index dff2d6077..55d4384b2 100644 --- a/service/java/com/android/server/wifi/WifiStateMachine.java +++ b/service/java/com/android/server/wifi/WifiStateMachine.java @@ -4969,12 +4969,17 @@ 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); + + " static=" + isUsingStaticIp + + " randomMac=" + isUsingMacRandomization); } // Send event to CM & network change broadcast @@ -5001,25 +5006,25 @@ public class WifiStateMachine extends StateMachine { if (!TextUtils.isEmpty(mTcpBufferSizes)) { mIpClient.setTcpBufferSizes(mTcpBufferSizes); } - final IpClient.ProvisioningConfiguration prov; + final IpClient.ProvisioningConfiguration.Builder prov; if (!isUsingStaticIp) { prov = IpClient.buildProvisioningConfiguration() .withPreDhcpAction() .withApfCapabilities(mWifiNative.getApfCapabilities(mInterfaceName)) .withNetwork(getCurrentNetwork()) .withDisplayName(currentConfig.SSID) - .withRandomMacAddress() - .build(); + if (isUsingMacRandomization) { + prov.withRandomMacAddress(); + } } else { StaticIpConfiguration staticIpConfig = currentConfig.getStaticIpConfiguration(); prov = IpClient.buildProvisioningConfiguration() .withStaticConfiguration(staticIpConfig) .withApfCapabilities(mWifiNative.getApfCapabilities(mInterfaceName)) .withNetwork(getCurrentNetwork()) - .withDisplayName(currentConfig.SSID) - .build(); + .withDisplayName(currentConfig.SSID); } - mIpClient.startProvisioning(prov); + mIpClient.startProvisioning(prov.build()); // Get Link layer stats so as we get fresh tx packet counters getWifiLinkLayerStats(); } |