summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
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
commitcd604a1a6e20aa43ebf21b4a1aa05e594c81747f (patch)
tree02743a14290374619febbf2577bcd4e2ee1d6578
parenta4472c018f815580a504d038c70ea4bf55754359 (diff)
Fix settings restore
Also correct the debug-mode logging of error locations in backup data. Bug 4914182 Change-Id: Ie7dda0192afa819e42490b7ffd2d3db6f11968f6
-rw-r--r--libs/utils/BackupData.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/libs/utils/BackupData.cpp b/libs/utils/BackupData.cpp
index f963058fab..8791263933 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;
}