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

Commit b55ccdad authored by vandwalle's avatar vandwalle Committed by Android (Google) Code Review
Browse files

Merge "add option to link only same credential configurations" into lmp-dev

parents 1fdfaa2e 5df82ba6

core/res/res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -360,6 +360,9 @@ 
    <!-- Boolean indicating associated network selection is allowed -->

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



    <!-- Boolean indicating that wifi only link configuratios that have exact same credentials (i.e PSK) -->

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



    <!-- Wifi driver stop delay, in milliseconds.

         Default value is 2 minutes. -->

    <integer translatable="false" name="config_wifi_driver_stop_delay">120000</integer>

core/res/res/values/symbols.xml

+1 −1
Original line number Diff line number Diff line
@@ -296,7 +296,7 @@ 
  <java-symbol type="bool" name="config_windowEnableCircularEmulatorDisplayOverlay" />

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

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



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

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

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

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