diff options
| author | Christopher Tate <ctate@google.com> | 2014-09-20 00:25:11 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-20 00:25:12 +0000 |
| commit | 4c45b649c36d6c28d22a98d979fbda3b7c36677a (patch) | |
| tree | fce80e3334d8a55322a7364865c61b69ca4126cd /packages/SettingsProvider | |
| parent | 000e464f304fc98def247c1452ee7829de1460a8 (diff) | |
| parent | 7274444b6ea91c8cf765d9236804f962c7f0ae16 (diff) | |
| download | frameworks_base-4c45b649c36d6c28d22a98d979fbda3b7c36677a.zip frameworks_base-4c45b649c36d6c28d22a98d979fbda3b7c36677a.tar.gz frameworks_base-4c45b649c36d6c28d22a98d979fbda3b7c36677a.tar.bz2 | |
Merge "Always give wifi a chance to quiet down during restore" into lmp-dev
Diffstat (limited to 'packages/SettingsProvider')
| -rw-r--r-- | packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java | 4 |
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); |