diff options
| author | Christopher Tate <ctate@google.com> | 2011-06-24 15:06:48 -0700 |
|---|---|---|
| committer | Alex Ray <aray@google.com> | 2013-07-30 13:56:57 -0700 |
| commit | 9d05973685fc6ebe8e2878597128c41a61e149f9 (patch) | |
| tree | 52ff99393c1ee18cf7e392c70a5b69801a2f9079 /libs/utils | |
| parent | 6839e8e9ee894191e3fa857859311337357fe191 (diff) | |
| download | system_core-9d05973685fc6ebe8e2878597128c41a61e149f9.zip system_core-9d05973685fc6ebe8e2878597128c41a61e149f9.tar.gz system_core-9d05973685fc6ebe8e2878597128c41a61e149f9.tar.bz2 | |
Fix settings restore
Also correct the debug-mode logging of error locations in backup data.
Bug 4914182
Change-Id: Ie7dda0192afa819e42490b7ffd2d3db6f11968f6
Diffstat (limited to 'libs/utils')
| -rw-r--r-- | libs/utils/BackupData.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libs/utils/BackupData.cpp b/libs/utils/BackupData.cpp index f963058..8791263 100644 --- a/libs/utils/BackupData.cpp +++ b/libs/utils/BackupData.cpp @@ -285,7 +285,8 @@ BackupDataReader::ReadNextHeader(bool* done, int* type) break; } default: - LOGD("Chunk header at %d has invalid type: 0x%08x", (int)m_pos, (int)m_header.type); + LOGD("Chunk header at %d has invalid type: 0x%08x", + (int)(m_pos - sizeof(m_header)), (int)m_header.type); m_status = EINVAL; } |