diff options
| author | Steve Block <steveblock@google.com> | 2012-01-05 23:22:43 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2012-01-06 10:07:54 +0000 |
| commit | 8564c8da817a845353d213acd8636b76f567b234 (patch) | |
| tree | 71acbd8ace822c769aef917629bf5a079f63274d /core/jni/android_backup_BackupHelperDispatcher.cpp | |
| parent | c42e6a0bed2c88fd03466c5104d62d7f98e68768 (diff) | |
| download | frameworks_base-8564c8da817a845353d213acd8636b76f567b234.zip frameworks_base-8564c8da817a845353d213acd8636b76f567b234.tar.gz frameworks_base-8564c8da817a845353d213acd8636b76f567b234.tar.bz2 | |
Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/157065
Bug: 5449033
Change-Id: I00a4b904f9449e6f93b7fd35eac28640d7929e69
Diffstat (limited to 'core/jni/android_backup_BackupHelperDispatcher.cpp')
| -rw-r--r-- | core/jni/android_backup_BackupHelperDispatcher.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/core/jni/android_backup_BackupHelperDispatcher.cpp b/core/jni/android_backup_BackupHelperDispatcher.cpp index 1f188ff..3e36677 100644 --- a/core/jni/android_backup_BackupHelperDispatcher.cpp +++ b/core/jni/android_backup_BackupHelperDispatcher.cpp @@ -58,7 +58,7 @@ readHeader_native(JNIEnv* env, jobject clazz, jobject headerObj, jobject fdObj) int remainingHeader = flattenedHeader.headerSize - sizeof(flattenedHeader.headerSize); if (flattenedHeader.headerSize < (int)sizeof(chunk_header_v1)) { - LOGW("Skipping unknown header: %d bytes", flattenedHeader.headerSize); + ALOGW("Skipping unknown header: %d bytes", flattenedHeader.headerSize); if (remainingHeader > 0) { lseek(fd, remainingHeader, SEEK_CUR); // >0 means skip this chunk @@ -69,13 +69,13 @@ readHeader_native(JNIEnv* env, jobject clazz, jobject headerObj, jobject fdObj) amt = read(fd, &flattenedHeader.version, sizeof(chunk_header_v1)-sizeof(flattenedHeader.headerSize)); if (amt <= 0) { - LOGW("Failed reading chunk header"); + ALOGW("Failed reading chunk header"); return -1; } remainingHeader -= sizeof(chunk_header_v1)-sizeof(flattenedHeader.headerSize); if (flattenedHeader.version != VERSION_1_HEADER) { - LOGW("Skipping unknown header version: 0x%08x, %d bytes", flattenedHeader.version, + ALOGW("Skipping unknown header version: 0x%08x, %d bytes", flattenedHeader.version, flattenedHeader.headerSize); if (remainingHeader > 0) { lseek(fd, remainingHeader, SEEK_CUR); @@ -94,14 +94,14 @@ readHeader_native(JNIEnv* env, jobject clazz, jobject headerObj, jobject fdObj) if (flattenedHeader.dataSize < 0 || flattenedHeader.nameLength < 0 || remainingHeader < flattenedHeader.nameLength) { - LOGW("Malformed V1 header remainingHeader=%d dataSize=%d nameLength=%d", remainingHeader, + ALOGW("Malformed V1 header remainingHeader=%d dataSize=%d nameLength=%d", remainingHeader, flattenedHeader.dataSize, flattenedHeader.nameLength); return -1; } buf = keyPrefix.lockBuffer(flattenedHeader.nameLength); if (buf == NULL) { - LOGW("unable to allocate %d bytes", flattenedHeader.nameLength); + ALOGW("unable to allocate %d bytes", flattenedHeader.nameLength); return -1; } |