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.
2011-07-25 12:21:06 -07:00
parent a7f68230be e612c881ec
commit 64ed105957
1 changed files with 2 additions and 1 deletions
--- 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);