diff options
| author | Kenny Root <kroot@android.com> | 2011-07-21 13:09:05 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-07-21 13:09:05 -0700 |
| commit | 4f3a8db64d75cd3e88213d3b105dc50fc5bd6262 (patch) | |
| tree | 7cd6494f863d6fa29c6b97ef0a4162a0ceb7f793 /libs | |
| parent | 594745abefe53abe7f577bbb3cc176d52ee00ba1 (diff) | |
| parent | 3cf039876177b5b314b635bb12a1dae1b42f4605 (diff) | |
| download | frameworks_base-4f3a8db64d75cd3e88213d3b105dc50fc5bd6262.zip frameworks_base-4f3a8db64d75cd3e88213d3b105dc50fc5bd6262.tar.gz frameworks_base-4f3a8db64d75cd3e88213d3b105dc50fc5bd6262.tar.bz2 | |
am 3cf03987: Merge "Continue idmap generation even if name lookup fails."
* commit '3cf039876177b5b314b635bb12a1dae1b42f4605':
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); |