diff options
| author | Mårten Kongstad <marten.kongstad@sonyericsson.com> | 2011-05-19 16:02:35 +0200 |
|---|---|---|
| committer | Johan Redestig <johan.redestig@sonyericsson.com> | 2011-05-19 16:02:35 +0200 |
| commit | fcaba1464ef010ba0e3fdcbce2af74e45daec627 (patch) | |
| tree | 3a052a521055196a7d7afe6ca97caea62c7e3327 /libs | |
| parent | 6c427617be940be32fdebbd9c78f9223b292c814 (diff) | |
| download | frameworks_base-fcaba1464ef010ba0e3fdcbce2af74e45daec627.zip frameworks_base-fcaba1464ef010ba0e3fdcbce2af74e45daec627.tar.gz frameworks_base-fcaba1464ef010ba0e3fdcbce2af74e45daec627.tar.bz2 | |
Continue idmap generation even if name lookup fails.
In resources.arsc files, a resource is represented by a specification
block and one or more value blocks. In rare cases, a resource name
is also given a new resource ID, a specification block and no values
blocks. This commit ensures idmap generation does not fail if such an
entry is encountered.
Change-Id: I32302a0b07a7a320b7eeb31886931be3bb7b7e9a
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); |