diff options
| author | Evan Charlton <evanc@google.com> | 2014-01-29 14:58:27 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-01-29 14:58:29 +0000 |
| commit | 33da8dde5f3e37f7097e59ad2d67e3e9f54b7436 (patch) | |
| tree | 09e4f1e878685f4a9f7421bd8d16d57fa68d5f5c /packages/SettingsProvider | |
| parent | 11f66d0874669cb23be87202f84b98be9ea7bbc8 (diff) | |
| parent | cc7b04353f432839ff52a3295a5b8c5374e7c8ad (diff) | |
| download | frameworks_base-33da8dde5f3e37f7097e59ad2d67e3e9f54b7436.zip frameworks_base-33da8dde5f3e37f7097e59ad2d67e3e9f54b7436.tar.gz frameworks_base-33da8dde5f3e37f7097e59ad2d67e3e9f54b7436.tar.bz2 | |
Merge "Allow for a configurable WiFi restore bounce delay"
Diffstat (limited to 'packages/SettingsProvider')
| -rw-r--r-- | packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java index 7b09092..45957a4 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java @@ -422,7 +422,11 @@ public class SettingsBackupAgent extends BackupAgentHelper { // If we have wifi data to restore, post a runnable to perform the // bounce-and-update operation a little ways in the future. if (mWifiRestore != null) { - new Handler(getMainLooper()).postDelayed(mWifiRestore, WIFI_BOUNCE_DELAY_MILLIS); + long wifiBounceDelayMillis = Settings.Global.getLong( + getContentResolver(), + Settings.Global.WIFI_BOUNCE_DELAY_OVERRIDE_MS, + WIFI_BOUNCE_DELAY_MILLIS); + new Handler(getMainLooper()).postDelayed(mWifiRestore, wifiBounceDelayMillis); } } |