Merge "Introduce config setting for scanning mac OUI" into lmp-dev

1 files changed, 16 insertions, 2 deletions

diff --git a/service/java/com/android/server/wifi/WifiStateMachine.java b/service/java/com/android/server/wifi/WifiStateMachine.java
index c2b822242..e4fd0abf8 100644
--- a/service/java/com/android/server/wifi/WifiStateMachine.java
+++ b/service/java/com/android/server/wifi/WifiStateMachine.java
@@ -127,7 +127,7 @@ public class WifiStateMachine extends StateMachine {
 
     private static final int ONE_HOUR_MILLI = 1000 * 60 * 60;
 
-    private static final byte[] GOOGLE_OUI = new byte[] { 0x00, 0x1A, 0x11};
+    private static final String GOOGLE_OUI = "DA-A1-19";
 
     /* temporary debug flag - best network selection development */
     private static boolean PDBG = false;
@@ -1135,6 +1135,19 @@ public class WifiStateMachine extends StateMachine {
         }
     }
 
+    private boolean setRandomMacOui() {
+        String oui = mContext.getResources().getString(
+                R.string.config_wifi_random_mac_oui, GOOGLE_OUI);
+        String[] ouiParts = oui.split("-");
+        byte[] ouiBytes = new byte[3];
+        ouiBytes[0] = (byte) (Integer.parseInt(ouiParts[0], 16) & 0xFF);
+        ouiBytes[1] = (byte) (Integer.parseInt(ouiParts[1], 16) & 0xFF);
+        ouiBytes[2] = (byte) (Integer.parseInt(ouiParts[2], 16) & 0xFF);
+
+        logd("Setting OUI to " + oui);
+        return mWifiNative.setScanningMacOui(ouiBytes);
+    }
+
     /*********************************************************
      * Methods exposed for public use
      ********************************************************/
@@ -4808,10 +4821,11 @@ public class WifiStateMachine extends StateMachine {
 
             mWifiNative.setScanInterval((int)mSupplicantScanIntervalMs / 1000);
             mWifiNative.setExternalSim(true);
-            mWifiNative.setScanningMacOui(GOOGLE_OUI);
 
+            setRandomMacOui();
             mWifiNative.enableAutoConnect(false);
         }
+
         @Override
         public boolean processMessage(Message message) {
             logStateAndMessage(message, getClass().getSimpleName());