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 | 2cc4e531f0950fd4faee67a74f29a6d7182674e7 (patch) | |
| tree | 6c43eb4ce620ab4dafe06cd471505693a303a2ea /libs/utils | |
| parent | a4460559064d844c63a51e4e4f6c5a19126fc021 (diff) | |
| parent | c0e7a061709d1c5f6d0cbd2bb4fd626af2c577d7 (diff) | |
| download | frameworks_native-2cc4e531f0950fd4faee67a74f29a6d7182674e7.zip frameworks_native-2cc4e531f0950fd4faee67a74f29a6d7182674e7.tar.gz frameworks_native-2cc4e531f0950fd4faee67a74f29a6d7182674e7.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/utils')
| -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); |