From 5067685ccf6c294a77a3e7f0577190600a0e6238 Mon Sep 17 00:00:00 2001 From: Christopher Tate Date: Thu, 4 Oct 2012 19:10:11 -0700 Subject: Settings (and general) restore fixes Pro tem, we ignore wifi configuration data when restoring system settings. This is not ideal, but it *does* mean we do not bounce wifi off and on again during the extended restore process, which in turn means we don't interfere with things like the Play Store's download of applications. We do continue to back up wifi configuration, and will start using that data again when the new implementation that restores AP configurations without having to bounce wifi comes to pass. Also, this CL fixes a longstanding bug in BackupDataInput.skipEntityData() that was being reproduced reliably once settings restore was skipping the wifi-related entities in the restore stream. Bug 7249405 Change-Id: I61520a9a116b66ebdf95734d09d9afd46406df01 --- libs/androidfw/BackupData.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'libs/androidfw/BackupData.cpp') diff --git a/libs/androidfw/BackupData.cpp b/libs/androidfw/BackupData.cpp index 7b1bcba2d130..4e3b52201110 100644 --- a/libs/androidfw/BackupData.cpp +++ b/libs/androidfw/BackupData.cpp @@ -327,6 +327,7 @@ BackupDataReader::SkipEntityData() if (pos == -1) { return errno; } + m_pos = pos; } SKIP_PADDING(); return NO_ERROR; -- cgit v1.2.3-59-g8ed1b