am ebff637b: am c9a016dd: Merge "Always give wifi a chance to quiet down during restore" into lmp-dev

* commit 'ebff637b894a60a20e62b12089c29779cc6f9e98':
  Always give wifi a chance to quiet down during restore
This commit is contained in:
Christopher Tate
2014-09-20 00:45:09 +00:00
committed by Android Git Automerger

View File

@@ -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);