diff options
| author | Christopher Tate <ctate@google.com> | 2012-09-14 17:58:59 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-14 17:59:00 -0700 |
| commit | 2892dfbeafec5315d05fb6ceabeaee73b88f5ff0 (patch) | |
| tree | ee2b2393965dfcb75bbb4f61d4d63a9bd888c18f /wifi/java/android/net | |
| parent | 8dd9206abbca6d143e3874abf46eca67f5340b31 (diff) | |
| parent | 6f5a9a96523ecf97a9828a410dd1226df47ec4e6 (diff) | |
| download | frameworks_base-2892dfbeafec5315d05fb6ceabeaee73b88f5ff0.zip frameworks_base-2892dfbeafec5315d05fb6ceabeaee73b88f5ff0.tar.gz frameworks_base-2892dfbeafec5315d05fb6ceabeaee73b88f5ff0.tar.bz2 | |
Merge "Fix default population of wifi settings" into jb-mr1-dev
Diffstat (limited to 'wifi/java/android/net')
| -rw-r--r-- | wifi/java/android/net/wifi/WifiStateMachine.java | 12 |
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 5e69482..c6bb069 100644 --- a/wifi/java/android/net/wifi/WifiStateMachine.java +++ b/wifi/java/android/net/wifi/WifiStateMachine.java @@ -396,14 +396,14 @@ public class WifiStateMachine extends StateMachine { * Default framework scan interval in milliseconds. This is used in the scenario in which * wifi chipset does not support background scanning to set up a * periodic wake up scan so that the device can connect to a new access - * point on the move. {@link Settings.Secure#WIFI_FRAMEWORK_SCAN_INTERVAL_MS} can + * point on the move. {@link Settings.Global#WIFI_FRAMEWORK_SCAN_INTERVAL_MS} can * override this. */ private final int mDefaultFrameworkScanIntervalMs; /** * Supplicant scan interval in milliseconds. - * Comes from {@link Settings.Secure#WIFI_SUPPLICANT_SCAN_INTERVAL_MS} or + * Comes from {@link Settings.Global#WIFI_SUPPLICANT_SCAN_INTERVAL_MS} or * from the default config if the setting is not set */ private long mSupplicantScanIntervalMs; @@ -2402,8 +2402,8 @@ public class WifiStateMachine extends StateMachine { int defaultInterval = mContext.getResources().getInteger( com.android.internal.R.integer.config_wifi_supplicant_scan_interval); - mSupplicantScanIntervalMs = Settings.Secure.getLong(mContext.getContentResolver(), - Settings.Secure.WIFI_SUPPLICANT_SCAN_INTERVAL_MS, + mSupplicantScanIntervalMs = Settings.Global.getLong(mContext.getContentResolver(), + Settings.Global.WIFI_SUPPLICANT_SCAN_INTERVAL_MS, defaultInterval); mWifiNative.setScanInterval((int)mSupplicantScanIntervalMs / 1000); @@ -3441,8 +3441,8 @@ public class WifiStateMachine extends StateMachine { if (DBG) log(getName() + "\n"); EventLog.writeEvent(EVENTLOG_WIFI_STATE_CHANGED, getName()); - mFrameworkScanIntervalMs = Settings.Secure.getLong(mContext.getContentResolver(), - Settings.Secure.WIFI_FRAMEWORK_SCAN_INTERVAL_MS, + mFrameworkScanIntervalMs = Settings.Global.getLong(mContext.getContentResolver(), + Settings.Global.WIFI_FRAMEWORK_SCAN_INTERVAL_MS, mDefaultFrameworkScanIntervalMs); /* * We initiate background scanning if it is enabled, otherwise we |