diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-06-29 16:37:39 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-06-29 16:37:39 -0700 |
| commit | bacc51026e8c95f34830defdfc1be4b359abf664 (patch) | |
| tree | fb8492e6c8de174b4e830e33cfac21bfd243b149 /libs/utils | |
| parent | 6034cb565c3b3ffb21057851cff179e2d5cb56a9 (diff) | |
| parent | d09f86ce175fad6ddbd446363f327dfa0575a1d2 (diff) | |
| download | frameworks_base-bacc51026e8c95f34830defdfc1be4b359abf664.zip frameworks_base-bacc51026e8c95f34830defdfc1be4b359abf664.tar.gz frameworks_base-bacc51026e8c95f34830defdfc1be4b359abf664.tar.bz2 | |
am d09f86ce: Merge changes 5548,5549 into donut
Merge commit 'd09f86ce175fad6ddbd446363f327dfa0575a1d2'
* commit 'd09f86ce175fad6ddbd446363f327dfa0575a1d2':
Better (and less) logging from backup.
Add an extra null terminator. String8::unlockBuffer is
Diffstat (limited to 'libs/utils')
| -rw-r--r-- | libs/utils/BackupData.cpp | 5 | ||||
| -rw-r--r-- | libs/utils/BackupHelpers.cpp | 7 |
2 files changed, 9 insertions, 3 deletions
diff --git a/libs/utils/BackupData.cpp b/libs/utils/BackupData.cpp index 0868cff..cce754a 100644 --- a/libs/utils/BackupData.cpp +++ b/libs/utils/BackupData.cpp @@ -107,7 +107,10 @@ BackupDataWriter::WriteEntityHeader(const String8& key, size_t dataSize) } else { k = key; } - LOGD("m_keyPrefix=%s key=%s k=%s", m_keyPrefix.string(), key.string(), k.string()); + if (true) { + LOGD("Writing entity: prefix='%s' key='%s' dataSize=%d", m_keyPrefix.string(), key.string(), + dataSize); + } entity_header_v1 header; ssize_t keyLen; diff --git a/libs/utils/BackupHelpers.cpp b/libs/utils/BackupHelpers.cpp index 99a4abc..4ad9b51 100644 --- a/libs/utils/BackupHelpers.cpp +++ b/libs/utils/BackupHelpers.cpp @@ -68,11 +68,15 @@ struct file_metadata_v1 { const static int CURRENT_METADATA_VERSION = 1; -#if 1 // TEST_BACKUP_HELPERS +#if 1 +#define LOGP(f, x...) +#else +#if TEST_BACKUP_HELPERS #define LOGP(f, x...) printf(f "\n", x) #else #define LOGP(x...) LOGD(x) #endif +#endif const static int ROUND_UP[4] = { 0, 3, 2, 1 }; @@ -349,7 +353,6 @@ back_up_files(int oldSnapshotFD, BackupDataWriter* dataStream, int newSnapshotFD err = stat(file, &st); if (err != 0) { - LOGW("Error stating file %s", file); r.deleted = true; } else { r.deleted = false; |