diff options
| author | vandwalle <vandwalle@google.com> | 2014-09-11 21:05:53 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-11 21:05:54 +0000 |
| commit | b55ccdad03a4fee0742df43aca9c76a501596df5 (patch) | |
| tree | 705a74a426432303222701be8d40e2c348f6ca42 /core | |
| parent | 1fdfaa2e82387d390cffa845a87441b385a0f647 (diff) | |
| parent | 5df82ba65b57ef3458b7211d2b5846fb1351ac3c (diff) | |
| download | frameworks_base-b55ccdad03a4fee0742df43aca9c76a501596df5.zip frameworks_base-b55ccdad03a4fee0742df43aca9c76a501596df5.tar.gz frameworks_base-b55ccdad03a4fee0742df43aca9c76a501596df5.tar.bz2 | |
Merge "add option to link only same credential configurations" into lmp-dev
Diffstat (limited to 'core')
| -rw-r--r-- | core/res/res/values/config.xml | 3 | ||||
| -rw-r--r-- | core/res/res/values/symbols.xml | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index ee699ed..3907fc5 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -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> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index c578263..7fc522f 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -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" /> |