diff options
| author | Kenny Root <kroot@android.com> | 2011-07-25 12:21:06 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-07-25 12:21:06 -0700 |
| commit | 64ed105957098a900d58e7c2598e060cb37755ce (patch) | |
| tree | f0a7d02f6ca119c8bbe1b758a581fec04eebdccc /libs/utils | |
| parent | a7f68230be1ac025dbeada77e2ff3f16bb2ac04c (diff) | |
| parent | e612c881ecf74770098aa9c07d4f0611ac982038 (diff) | |
| download | frameworks_base-64ed105957098a900d58e7c2598e060cb37755ce.zip frameworks_base-64ed105957098a900d58e7c2598e060cb37755ce.tar.gz frameworks_base-64ed105957098a900d58e7c2598e060cb37755ce.tar.bz2 | |
am e612c881: am 4f3a8db6: am 3cf03987: Merge "Continue idmap generation even if name lookup fails."
* commit 'e612c881ecf74770098aa9c07d4f0611ac982038':
Continue idmap generation even if name lookup fails.
Diffstat (limited to 'libs/utils')
| -rw-r--r-- | libs/utils/ResourceTypes.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libs/utils/ResourceTypes.cpp b/libs/utils/ResourceTypes.cpp index cb6c246..6cf01c8 100644 --- a/libs/utils/ResourceTypes.cpp +++ b/libs/utils/ResourceTypes.cpp @@ -4346,7 +4346,8 @@ status_t ResTable::createIdmap(const ResTable& overlay, uint32_t originalCrc, ui | (0x0000ffff & (entryIndex)); resource_name resName; if (!this->getResourceName(resID, &resName)) { - return UNKNOWN_ERROR; + LOGW("idmap: resource 0x%08x has spec but lacks values, skipping\n", resID); + continue; } const String16 overlayType(resName.type, resName.typeLen); |