From bf6f6f9de72c9fd15e6bda9f228c05a9b37d6324 Mon Sep 17 00:00:00 2001 From: Jeff Brown Date: Tue, 25 Sep 2012 15:03:20 -0700 Subject: 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 --- wifi/java/android/net/wifi/WifiStateMachine.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'wifi') 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); } -- cgit v1.1