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

Merge "Need to explicitly disable scan-always when turning off wifi" into jb-mr2-dev

Browse Source
This commit is contained in:
Christopher Tate
2013-06-11 22:04:38 +00:00
committed by Android (Google) Code Review
parent cd5b3310e2 87bc7e7082
commit 76b76666f5
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,6 +20,7 @@ import android.app.backup.BackupAgentHelper;
import android.app.backup.BackupDataInput; import android.app.backup.BackupDataInput;
import android.app.backup.BackupDataOutput; import android.app.backup.BackupDataOutput;
import android.app.backup.FullBackupDataOutput; import android.app.backup.FullBackupDataOutput;
import android.content.ContentResolver;
import android.content.ContentValues; import android.content.ContentValues;
import android.content.Context; import android.content.Context;
import android.database.Cursor; import android.database.Cursor;
@@ -330,7 +331,16 @@ public class SettingsBackupAgent extends BackupAgentHelper {
if (DEBUG_BACKUP) { if (DEBUG_BACKUP) {
Log.v(TAG, "Starting deferred restore of wifi data"); Log.v(TAG, "Starting deferred restore of wifi data");
} }
final ContentResolver cr = getContentResolver();
final int scanAlways = Settings.Global.getInt(cr,
Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE, 0);
final int retainedWifiState = enableWifi(false); final int retainedWifiState = enableWifi(false);
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) {}
}
if (restoredSupplicantData != null) { if (restoredSupplicantData != null) {
restoreWifiSupplicant(FILE_WIFI_SUPPLICANT, restoreWifiSupplicant(FILE_WIFI_SUPPLICANT,
restoredSupplicantData, restoredSupplicantData.length); restoredSupplicantData, restoredSupplicantData.length);
@@ -344,6 +354,10 @@ public class SettingsBackupAgent extends BackupAgentHelper {
restoredWifiConfigFile, restoredWifiConfigFile.length); restoredWifiConfigFile, restoredWifiConfigFile.length);
} }
// restore the previous WIFI state. // restore the previous WIFI state.
if (scanAlways != 0) {
Settings.Global.putInt(cr,
Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE, scanAlways);
}
enableWifi(retainedWifiState == WifiManager.WIFI_STATE_ENABLED || enableWifi(retainedWifiState == WifiManager.WIFI_STATE_ENABLED ||
retainedWifiState == WifiManager.WIFI_STATE_ENABLING); retainedWifiState == WifiManager.WIFI_STATE_ENABLING);
} }