Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5fc770d2 authored by Vinit Deshpande's avatar Vinit Deshpande Committed by Android Git Automerger
Browse files

am 0604f9b7: am f9b8c88c: Merge "Introduce config setting for scanning mac OUI" into lmp-dev 

* commit '0604f9b7eaf51920c177f5af845bb254c3695074':
  Introduce config setting for scanning mac OUI
parents 4867c6bf 76d21837

core/res/res/values/config.xml

+2 −0
Original line number Original line Diff line number Diff line
@@ -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_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_24">24</integer>

    <integer translatable="false" name="config_wifi_framework_wifi_score_good_link_speed_5">36</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>

    <bool translatable="false" name="config_wifi_framework_cellular_handover_enable_user_triggered_adjustment">true</bool>





    <!-- Integer packet threshold used to allow scan while associated -->

    <!-- Integer packet threshold used to allow scan while associated -->

core/res/res/values/symbols.xml

+2 −0
Original line number Original line Diff line number Diff line
@@ -323,6 +323,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_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_24" />

  <java-symbol type="integer" name="config_wifi_framework_wifi_score_good_link_speed_5" />

  <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="editable_voicemailnumber" />





  <java-symbol type="bool" name="config_wifi_framework_cellular_handover_enable_user_triggered_adjustment" />

  <java-symbol type="bool" name="config_wifi_framework_cellular_handover_enable_user_triggered_adjustment" />