From cd604a1a6e20aa43ebf21b4a1aa05e594c81747f Mon Sep 17 00:00:00 2001 From: Christopher Tate Date: Fri, 24 Jun 2011 15:06:48 -0700 Subject: [PATCH] Fix settings restore Also correct the debug-mode logging of error locations in backup data. Bug 4914182 Change-Id: Ie7dda0192afa819e42490b7ffd2d3db6f11968f6 --- libs/utils/BackupData.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libs/utils/BackupData.cpp b/libs/utils/BackupData.cpp index f963058fa..879126393 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; }