commit 9d05973685fc6ebe8e2878597128c41a61e149f9
author Christopher Tate <ctate@google.com> Fri Jun 24 15:06:48 2011 -0700
committer Alex Ray <aray@google.com> Tue Jul 30 13:56:57 2013 -0700
tree 52ff99393c1ee18cf7e392c70a5b69801a2f9079
parent 6839e8e9ee894191e3fa857859311337357fe191

Fix settings restore

Also correct the debug-mode logging of error locations in backup data.
Bug 4914182

Change-Id: Ie7dda0192afa819e42490b7ffd2d3db6f11968f6

libs/utils/BackupData.cpp

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 @@
             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;
     }