Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 46380962 authored by Christopher Tate's avatar Christopher Tate Committed by Android Git Automerger
Browse files

am 1f2e31ef: am 1c1ffb64: am 4cd2c811: am ebff637b: am c9a016dd: Merge "Always... 

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

* commit '1f2e31efb8ce78f99c86f7847b7498e23937d2ff':
  Always give wifi a chance to quiet down during restore
parents 09a52851 a3d0f3f4

packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java

+2 −2
Original line number Diff line number Diff line
@@ -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);