Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am db0cff71: am c376afb4: Merge "Wait a bit longer for wifi to shut down before rewriting the config" into mnc-dev

Browse Source 
* commit 'db0cff71c8d1a7f7f1d5c12a4f7c343030adf21b':
  Wait a bit longer for wifi to shut down before rewriting the config
This commit is contained in:
Chris Tate
2015-08-07 18:36:09 +00:00
committed by Android Git Automerger
parent 5096ee814b db0cff71c8
commit 117f024b25
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java
View File

@@ -447,8 +447,10 @@ public class SettingsBackupAgent extends BackupAgentHelper {
Settings.Global.putInt(cr, Settings.Global.putInt(cr,
Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE, 0); Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE, 0);
} }
// !!! Give the wifi stack a moment to quiesce // !!! Give the wifi stack a moment to quiesce. We've observed the
try { Thread.sleep(1500); } catch (InterruptedException e) {} // response to disabling WIFI_SCAN_ALWAYS_AVAILABLE taking more
// than 1500ms, so we wait a generous 2500 here before proceeding.
try { Thread.sleep(2500); } catch (InterruptedException e) {}
if (restoredSupplicantData != null) { if (restoredSupplicantData != null) {
restoreWifiSupplicant(FILE_WIFI_SUPPLICANT, restoreWifiSupplicant(FILE_WIFI_SUPPLICANT,
restoredSupplicantData, restoredSupplicantData.length); restoredSupplicantData, restoredSupplicantData.length);