am f9b8c88c: Merge "Introduce config setting for scanning mac OUI" into lmp-dev
* commit 'f9b8c88c6529daebe9676d7c440fcd3e478ec034':
Introduce config setting for scanning mac OUI
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index 7ef406a..7d7db12 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -365,6 +365,8 @@
<integer translatable="false" name="config_wifi_framework_wifi_score_bad_link_speed_5">12</integer>
<integer translatable="false" name="config_wifi_framework_wifi_score_good_link_speed_24">24</integer>
<integer translatable="false" name="config_wifi_framework_wifi_score_good_link_speed_5">36</integer>
+ <string translatable="false" name="config_wifi_random_mac_oui">DA-A1-19</string>
+
<bool translatable="false" name="config_wifi_framework_cellular_handover_enable_user_triggered_adjustment">true</bool>
<!-- Integer packet threshold used to allow scan while associated -->
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index 5c246a4..d8d0ccd 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -322,6 +322,8 @@
<java-symbol type="integer" name="config_wifi_framework_wifi_score_bad_link_speed_5" />
<java-symbol type="integer" name="config_wifi_framework_wifi_score_good_link_speed_24" />
<java-symbol type="integer" name="config_wifi_framework_wifi_score_good_link_speed_5" />
+ <java-symbol type="string" name="config_wifi_random_mac_oui" />
+
<java-symbol type="bool" name="editable_voicemailnumber" />
<java-symbol type="bool" name="config_wifi_framework_cellular_handover_enable_user_triggered_adjustment" />