diff options
author | Christopher Tate <ctate@google.com> | 2011-06-24 15:06:48 -0700 |
---|---|---|
committer | Christopher Tate <ctate@google.com> | 2011-06-24 15:06:48 -0700 |
commit | 28cdb9e104e03680d61c3e6dd654d1beff51427d (patch) | |
tree | d3f75c93366e41e3fecb647cb39e75dc4dea3d53 /libs/utils | |
parent | 40e44467e2a32e77f6d874281a1c8185794850ff (diff) | |
download | frameworks_base-28cdb9e104e03680d61c3e6dd654d1beff51427d.zip frameworks_base-28cdb9e104e03680d61c3e6dd654d1beff51427d.tar.gz frameworks_base-28cdb9e104e03680d61c3e6dd654d1beff51427d.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..87912639 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; } |