Merge "Add flag to enable enhanced mac randomization" into rvc-dev

1 files changed, 7 insertions, 0 deletions

diff --git a/service/java/com/android/server/wifi/WifiConfigManager.java b/service/java/com/android/server/wifi/WifiConfigManager.java
index 309f54f60..90c7f42c2 100644
--- a/service/java/com/android/server/wifi/WifiConfigManager.java
+++ b/service/java/com/android/server/wifi/WifiConfigManager.java
@@ -198,6 +198,9 @@ public class WifiConfigManager {
 
     @VisibleForTesting
     public static final int SCAN_RESULT_MISSING_COUNT_THRESHOLD = 1;
+    @VisibleForTesting
+    protected static final String ENHANCED_MAC_RANDOMIZATION_FEATURE_FORCE_ENABLE_FLAG =
+            "enhanced_mac_randomization_force_enabled";
 
     /**
      * General sorting algorithm of all networks for scanning purposes:
@@ -423,6 +426,10 @@ public class WifiConfigManager {
                 || config.macRandomizationSetting != WifiConfiguration.RANDOMIZATION_PERSISTENT) {
             return false;
         }
+        if (mFrameworkFacade.getIntegerSetting(mContext,
+                ENHANCED_MAC_RANDOMIZATION_FEATURE_FORCE_ENABLE_FLAG, 0) == 1) {
+            return true;
+        }
         if (config.getIpConfiguration().getIpAssignment() == IpConfiguration.IpAssignment.STATIC) {
             return false;
         }