summaryrefslogtreecommitdiffstats
path: root/wifi
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2012-09-25 15:03:20 -0700
committerJeff Brown <jeffbrown@google.com>2012-09-25 15:27:51 -0700
commitbf6f6f9de72c9fd15e6bda9f228c05a9b37d6324 (patch)
treed0b8906847bdb134fc8ab9b1bae876fccd4611c0 /wifi
parentd49359631bc2642be73dc162a8a73207df1e0baf (diff)
downloadframeworks_base-bf6f6f9de72c9fd15e6bda9f228c05a9b37d6324.zip
frameworks_base-bf6f6f9de72c9fd15e6bda9f228c05a9b37d6324.tar.gz
frameworks_base-bf6f6f9de72c9fd15e6bda9f228c05a9b37d6324.tar.bz2
Update references to migrated global settings.
Fixed one setting that was migrated but not marked deprecated. Removed a hidden setting that is no longer used by the new power manager service. Bug: 7231172 Change-Id: I332f020f876a18d519a1a20598a172f1c98036f7
Diffstat (limited to 'wifi')
-rw-r--r--wifi/java/android/net/wifi/WifiStateMachine.java12
1 files changed, 6 insertions, 6 deletions
diff --git a/wifi/java/android/net/wifi/WifiStateMachine.java b/wifi/java/android/net/wifi/WifiStateMachine.java
index 4aa092b..e7927ae 100644
--- a/wifi/java/android/net/wifi/WifiStateMachine.java
+++ b/wifi/java/android/net/wifi/WifiStateMachine.java
@@ -1060,8 +1060,8 @@ public class WifiStateMachine extends StateMachine {
*/
public void setCountryCode(String countryCode, boolean persist) {
if (persist) {
- Settings.Secure.putString(mContext.getContentResolver(),
- Settings.Secure.WIFI_COUNTRY_CODE,
+ Settings.Global.putString(mContext.getContentResolver(),
+ Settings.Global.WIFI_COUNTRY_CODE,
countryCode);
}
sendMessage(obtainMessage(CMD_SET_COUNTRY_CODE, countryCode));
@@ -1318,8 +1318,8 @@ public class WifiStateMachine extends StateMachine {
* Set the country code from the system setting value, if any.
*/
private void setCountryCode() {
- String countryCode = Settings.Secure.getString(mContext.getContentResolver(),
- Settings.Secure.WIFI_COUNTRY_CODE);
+ String countryCode = Settings.Global.getString(mContext.getContentResolver(),
+ Settings.Global.WIFI_COUNTRY_CODE);
if (countryCode != null && !countryCode.isEmpty()) {
setCountryCode(countryCode, false);
} else {
@@ -1609,8 +1609,8 @@ public class WifiStateMachine extends StateMachine {
}
private int getMaxDhcpRetries() {
- return Settings.Secure.getInt(mContext.getContentResolver(),
- Settings.Secure.WIFI_MAX_DHCP_RETRY_COUNT,
+ return Settings.Global.getInt(mContext.getContentResolver(),
+ Settings.Global.WIFI_MAX_DHCP_RETRY_COUNT,
DEFAULT_MAX_DHCP_RETRIES);
}