diff options
| author | Kenny Root <kroot@android.com> | 2011-07-25 17:24:52 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-07-25 17:24:52 -0700 |
| commit | fa93052d91ab6e6da3195ce3872c4543beb6d5c9 (patch) | |
| tree | 4ac0e55c585acc4907211639d6733d4d7b76c056 /libs | |
| parent | eedc6f0d7dc7dc8ce86d787ce532ed0aa2d61d91 (diff) | |
| parent | 64ed105957098a900d58e7c2598e060cb37755ce (diff) | |
| download | frameworks_base-fa93052d91ab6e6da3195ce3872c4543beb6d5c9.zip frameworks_base-fa93052d91ab6e6da3195ce3872c4543beb6d5c9.tar.gz frameworks_base-fa93052d91ab6e6da3195ce3872c4543beb6d5c9.tar.bz2 | |
am 64ed1059: am e612c881: am 4f3a8db6: am 3cf03987: Merge "Continue idmap generation even if name lookup fails."
* commit '64ed105957098a900d58e7c2598e060cb37755ce':
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 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); |