diff options
| author | Steve Block <steveblock@google.com> | 2012-01-06 19:16:58 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2012-01-08 11:26:30 +0000 |
| commit | c1a4ab9c313d8a3d12007f2dbef7b5a6fa4ac2ef (patch) | |
| tree | 76e90a6ae1910835a56e4dad3f60f42392645703 /vm/DvmDex.cpp | |
| parent | e8e1ddccd616e8226b7cc1e4e9fdb327429249e8 (diff) | |
| download | android_dalvik-c1a4ab9c313d8a3d12007f2dbef7b5a6fa4ac2ef.tar.gz android_dalvik-c1a4ab9c313d8a3d12007f2dbef7b5a6fa4ac2ef.tar.bz2 android_dalvik-c1a4ab9c313d8a3d12007f2dbef7b5a6fa4ac2ef.zip | |
Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/#/c/157220
Also fix an occurrence of LOGW missed in an earlier change.
Bug: 5449033
Change-Id: I2e3b23839e6dcd09015d6402280e9300c75e3406
Diffstat (limited to 'vm/DvmDex.cpp')
| -rw-r--r-- | vm/DvmDex.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/vm/DvmDex.cpp b/vm/DvmDex.cpp index 84f340746..4bad999a3 100644 --- a/vm/DvmDex.cpp +++ b/vm/DvmDex.cpp @@ -81,7 +81,7 @@ static DvmDex* allocateAuxStructures(DexFile* pDexFile) pDvmDex->pResFields == NULL || pDvmDex->pInterfaceCache == NULL) { - LOGE("Alloc failure in allocateAuxStructures"); + ALOGE("Alloc failure in allocateAuxStructures"); free(pDvmDex->pResStrings); free(pDvmDex->pResClasses); free(pDvmDex->pResMethods); @@ -112,18 +112,18 @@ int dvmDexFileOpenFromFd(int fd, DvmDex** ppDvmDex) parseFlags |= kDexParseVerifyChecksum; if (lseek(fd, 0, SEEK_SET) < 0) { - LOGE("lseek rewind failed"); + ALOGE("lseek rewind failed"); goto bail; } if (sysMapFileInShmemWritableReadOnly(fd, &memMap) != 0) { - LOGE("Unable to map file"); + ALOGE("Unable to map file"); goto bail; } pDexFile = dexFileParse((u1*)memMap.addr, memMap.length, parseFlags); if (pDexFile == NULL) { - LOGE("DEX parse failed"); + ALOGE("DEX parse failed"); sysReleaseShmem(&memMap); goto bail; } @@ -167,7 +167,7 @@ int dvmDexFileOpenPartial(const void* addr, int len, DvmDex** ppDvmDex) pDexFile = dexFileParse((u1*)addr, len, parseFlags); if (pDexFile == NULL) { - LOGE("DEX parse failed"); + ALOGE("DEX parse failed"); goto bail; } pDvmDex = allocateAuxStructures(pDexFile); |