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

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

Browse Source
This commit is contained in:
Chris Tate
2015-08-07 18:15:19 +00:00
committed by Android (Google) Code Review
parent 3d06ea0349 907e01eb70
commit c376afb472
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.WIFI_SCAN_ALWAYS_AVAILABLE, 0);
}
// !!! Give the wifi stack a moment to quiesce
try { Thread.sleep(1500); } catch (InterruptedException e) {}
// !!! Give the wifi stack a moment to quiesce. We've observed the
// 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) {
restoreWifiSupplicant(FILE_WIFI_SUPPLICANT,
restoredSupplicantData, restoredSupplicantData.length);