summaryrefslogtreecommitdiffstats
path: root/packages/SettingsProvider
diff options
context:
space:
mode:
authorChristopher Tate <ctate@google.com>2014-09-19 17:03:59 -0700
committerChristopher Tate <ctate@google.com>2014-09-19 17:03:59 -0700
commit7274444b6ea91c8cf765d9236804f962c7f0ae16 (patch)
treebd2ec1547b128d0186b187ad63b6fb45024634ac /packages/SettingsProvider
parent6920feedb59899373040447e351c35909ffa1b45 (diff)
downloadframeworks_base-7274444b6ea91c8cf765d9236804f962c7f0ae16.zip
frameworks_base-7274444b6ea91c8cf765d9236804f962c7f0ae16.tar.gz
frameworks_base-7274444b6ea91c8cf765d9236804f962c7f0ae16.tar.bz2
Always give wifi a chance to quiet down during restore
Not just when the current scan-always setting is on. Bug 17571997 Change-Id: Idc56c9682c18f5e23c0bde98736522a79583af5e
Diffstat (limited to 'packages/SettingsProvider')
-rw-r--r--packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java
index 45957a4..78af785 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java
@@ -352,9 +352,9 @@ public class SettingsBackupAgent extends BackupAgentHelper {
if (scanAlways != 0) {
Settings.Global.putInt(cr,
Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE, 0);
- // !!! Give the wifi stack a moment to quiesce
- try { Thread.sleep(1000); } catch (InterruptedException e) {}
}
+ // !!! Give the wifi stack a moment to quiesce
+ try { Thread.sleep(1500); } catch (InterruptedException e) {}
if (restoredSupplicantData != null) {
restoreWifiSupplicant(FILE_WIFI_SUPPLICANT,
restoredSupplicantData, restoredSupplicantData.length);