Avoid changing wifi mac address when device does not support randomization

Devices without a vendor hal do not provide a way for the wifi framework
to get the factory mac address, so switching from a random mac to
the configured mac requires a reboot. So if mac randomization has not
been enabled in the device config, don't attempt to change the mac.

Bug: 146507767
Test: atest ClientModeImplTest
Change-Id: I53212dc05813001d0ccabeeb4cd491dec06929a4

1 files changed, 6 insertions, 6 deletions

diff --git a/service/java/com/android/server/wifi/ClientModeImpl.java b/service/java/com/android/server/wifi/ClientModeImpl.java
index b1a7d3e8b..879b98d13 100644
--- a/service/java/com/android/server/wifi/ClientModeImpl.java
+++ b/service/java/com/android/server/wifi/ClientModeImpl.java
@@ -6375,12 +6375,12 @@ public class ClientModeImpl extends StateMachine {
             config.setSecurityParams(WifiConfiguration.SECURITY_TYPE_SAE);
         }
 
-        if (config.macRandomizationSetting
-                == WifiConfiguration.RANDOMIZATION_PERSISTENT
-                && isConnectedMacRandomizationEnabled()) {
-            configureRandomizedMacAddress(config);
-        } else {
-            setCurrentMacToFactoryMac(config);
+        if (isConnectedMacRandomizationEnabled()) {
+            if (config.macRandomizationSetting == WifiConfiguration.RANDOMIZATION_PERSISTENT) {
+                configureRandomizedMacAddress(config);
+            } else {
+                setCurrentMacToFactoryMac(config);
+            }
         }
 
         if (config.enterpriseConfig != null