diff options
author | Ahmed ElArabawy <arabawy@google.com> | 2020-01-02 09:23:00 -0800 |
---|---|---|
committer | Ahmed ElArabawy <arabawy@google.com> | 2020-01-09 21:38:20 +0000 |
commit | d48bb2934fbf8edc80bad3b10471771d19c06f13 (patch) | |
tree | 922c69d36ffe31f96d689dcbf6bcdfe498176bd4 /service | |
parent | b2a64cb06962b17a876d57e134317643fb761087 (diff) |
Rename newly added configs to camel case format
This commit renames newly added configs to follow camel case format.
Bug: 142752869
Test: atest frameworks/opt/net/wifi/tests/wifitests/
Change-Id: I9240c4f835f5980382a2ba19a7905bed64677714
Diffstat (limited to 'service')
-rw-r--r-- | service/java/com/android/server/wifi/WifiServiceImpl.java | 2 | ||||
-rw-r--r-- | service/java/com/android/server/wifi/util/ApConfigUtil.java | 4 | ||||
-rw-r--r-- | service/res/values/config.xml | 4 | ||||
-rw-r--r-- | service/res/values/overlayable.xml | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/service/java/com/android/server/wifi/WifiServiceImpl.java b/service/java/com/android/server/wifi/WifiServiceImpl.java index 9874a8f2c..2bf5f473e 100644 --- a/service/java/com/android/server/wifi/WifiServiceImpl.java +++ b/service/java/com/android/server/wifi/WifiServiceImpl.java @@ -986,7 +986,7 @@ public class WifiServiceImpl extends BaseWifiService { int carrierMaxClient = carrierConfig.getInt( CarrierConfigManager.Wifi.KEY_HOTSPOT_MAX_CLIENT_COUNT); int finalSupportedClientNumber = mContext.getResources().getInteger( - R.integer.config_wifi_hardware_soft_ap_max_client_count); + R.integer.config_wifiHardwareSoftapMaxClientCount); if (carrierMaxClient > 0) { finalSupportedClientNumber = Math.min(finalSupportedClientNumber, carrierMaxClient); diff --git a/service/java/com/android/server/wifi/util/ApConfigUtil.java b/service/java/com/android/server/wifi/util/ApConfigUtil.java index df38457cc..467327613 100644 --- a/service/java/com/android/server/wifi/util/ApConfigUtil.java +++ b/service/java/com/android/server/wifi/util/ApConfigUtil.java @@ -503,7 +503,7 @@ public class ApConfigUtil { } if (context.getResources().getBoolean( - R.bool.config_wifi_sofap_client_force_disconnect_supported)) { + R.bool.config_wifiSofapClientForceDisconnectSupported)) { Log.d(TAG, "Update Softap capability, add client control feature support"); features |= SoftApCapability.SOFTAP_FEATURE_CLIENT_FORCE_DISCONNECT; } @@ -514,7 +514,7 @@ public class ApConfigUtil { } SoftApCapability capability = new SoftApCapability(features); int hardwareSupportedMaxClient = context.getResources().getInteger( - R.integer.config_wifi_hardware_soft_ap_max_client_count); + R.integer.config_wifiHardwareSoftapMaxClientCount); if (hardwareSupportedMaxClient > 0) { Log.d(TAG, "Update Softap capability, max client = " + hardwareSupportedMaxClient); capability.setMaxSupportedClients(hardwareSupportedMaxClient); diff --git a/service/res/values/config.xml b/service/res/values/config.xml index dcde730cc..98a005e6d 100644 --- a/service/res/values/config.xml +++ b/service/res/values/config.xml @@ -128,7 +128,7 @@ <integer translatable="false" name="config_wifi_framework_soft_ap_timeout_delay">600000</integer> <!-- Integer indicating maximum hardware supported client number of soft ap --> - <integer translatable="false" name="config_wifi_hardware_soft_ap_max_client_count">16</integer> + <integer translatable="false" name="config_wifiHardwareSoftapMaxClientCount">16</integer> <string translatable="false" name="config_wifi_random_mac_oui">DA-A1-19</string> @@ -170,7 +170,7 @@ <bool translatable="false" name="config_wifi_framework_enable_soft_ap_sar_tx_power_limit">false</bool> <!-- Wifi Hal supports force client disconnect for softap --> - <bool translatable="false" name="config_wifi_sofap_client_force_disconnect_supported">true</bool> + <bool translatable="false" name="config_wifiSofapClientForceDisconnectSupported">true</bool> <!-- Wifi driver supports Automatic channel selection (ACS) for softap --> <bool translatable="false" name="config_wifi_softap_acs_supported">false</bool> diff --git a/service/res/values/overlayable.xml b/service/res/values/overlayable.xml index 420c012f4..7d63b3448 100644 --- a/service/res/values/overlayable.xml +++ b/service/res/values/overlayable.xml @@ -66,7 +66,7 @@ <item type="bool" name="config_wifi_only_link_same_credential_configurations" /> <item type="bool" name="config_wifi_framework_enable_sar_tx_power_limit" /> <item type="bool" name="config_wifi_framework_enable_soft_ap_sar_tx_power_limit" /> - <item type="bool" name="config_wifi_sofap_client_force_disconnect_supported" /> + <item type="bool" name="config_wifiSofapClientForceDisconnectSupported" /> <item type="bool" name="config_wifi_softap_acs_supported" /> <item type="bool" name="config_wifi_softap_sae_supported" /> <item type="bool" name="config_wifi_softap_ieee80211ac_supported" /> @@ -96,7 +96,7 @@ <item type="array" name="config_wifiDisconnectedScanIntervalScheduleSec" /> <item type="array" name="config_wifiConnectedScanIntervalScheduleSec" /> <item type="bool" name="config_wifiScanHiddenNetworksScanOnlyMode" /> - <item type="integer" name="config_wifi_hardware_soft_ap_max_client_count" /> + <item type="integer" name="config_wifiHardwareSoftapMaxClientCount" /> <!-- Params from config.xml that can be overlayed --> <!-- Params from strings.xml that can be overlayed --> |