diff options
| author | Kenny Root <kroot@android.com> | 2011-07-21 13:05:03 -0700 |
|---|---|---|
| committer | Android Code Review <code-review@android.com> | 2011-07-21 13:05:03 -0700 |
| commit | 3cf039876177b5b314b635bb12a1dae1b42f4605 (patch) | |
| tree | f8fd7e047d1377dc8d47254293de9b62ef1aa032 /libs | |
| parent | b9f87f1970217d24213c8e3dd7755a0e4d82f8eb (diff) | |
| parent | fcaba1464ef010ba0e3fdcbce2af74e45daec627 (diff) | |
| download | frameworks_base-3cf039876177b5b314b635bb12a1dae1b42f4605.zip frameworks_base-3cf039876177b5b314b635bb12a1dae1b42f4605.tar.gz frameworks_base-3cf039876177b5b314b635bb12a1dae1b42f4605.tar.bz2 | |
Merge "Continue idmap generation even if name lookup fails."
Diffstat (limited to 'libs')
| -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 57aaf24..fc5a3ab 100644 --- a/libs/utils/ResourceTypes.cpp +++ b/libs/utils/ResourceTypes.cpp @@ -4200,7 +4200,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); |