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

Merge "Settings (and general) restore fixes" into jb-mr1-dev

Browse Source
This commit is contained in:
Christopher Tate
2012-10-04 19:36:41 -07:00
committed by Android (Google) Code Review
parent 82b946496e 5067685ccf
commit 0cd3c976a2
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libs/androidfw/BackupData.cpp
View File

@@ -327,6 +327,7 @@ BackupDataReader::SkipEntityData()
if (pos == -1) {
return errno;
}
m_pos = pos;
}
SKIP_PADDING();
return NO_ERROR;

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

@@ -61,6 +61,12 @@ public class SettingsBackupAgent extends BackupAgentHelper {
private static final boolean DEBUG = false;
private static final boolean DEBUG_BACKUP = DEBUG || false;
/* Don't restore wifi config until we have new logic for parsing the
* saved wifi config and configuring the new APs without having to
* disable and re-enable wifi
*/
private static final boolean NAIVE_WIFI_RESTORE = false;
private static final String KEY_SYSTEM = "system";
private static final String KEY_SECURE = "secure";
private static final String KEY_GLOBAL = "global";
@@ -307,7 +313,7 @@ public class SettingsBackupAgent extends BackupAgentHelper {
mSettingsHelper.applyAudioSettings();
} else if (KEY_SECURE.equals(key)) {
restoreSettings(data, Settings.Secure.CONTENT_URI, movedToGlobal);
} else if (KEY_WIFI_SUPPLICANT.equals(key)) {
} else if (NAIVE_WIFI_RESTORE && KEY_WIFI_SUPPLICANT.equals(key)) {
int retainedWifiState = enableWifi(false);
restoreWifiSupplicant(FILE_WIFI_SUPPLICANT, data);
FileUtils.setPermissions(FILE_WIFI_SUPPLICANT,
@@ -321,7 +327,7 @@ public class SettingsBackupAgent extends BackupAgentHelper {
byte[] localeData = new byte[size];
data.readEntityData(localeData, 0, size);
mSettingsHelper.setLocaleData(localeData, size);
} else if (KEY_WIFI_CONFIG.equals(key)) {
} else if (NAIVE_WIFI_RESTORE && KEY_WIFI_CONFIG.equals(key)) {
restoreFileData(mWifiConfigFile, data);
} else {
data.skipEntityData();