diff options
| author | Adam Powell <adamp@google.com> | 2014-10-01 18:11:18 +0000 |
|---|---|---|
| committer | Adam Powell <adamp@google.com> | 2014-10-01 18:11:18 +0000 |
| commit | 908c748096d855d47da2f5e20fd4d9d31d1e603c (patch) | |
| tree | 8031415a8deef274fa5bc89ba5c9744d6378889b /libs/androidfw | |
| parent | 5069dd69898bd0d9c69ba2bbd37239ec8d1c9dc6 (diff) | |
| download | frameworks_base-908c748096d855d47da2f5e20fd4d9d31d1e603c.zip frameworks_base-908c748096d855d47da2f5e20fd4d9d31d1e603c.tar.gz frameworks_base-908c748096d855d47da2f5e20fd4d9d31d1e603c.tar.bz2 | |
Revert "Fix issue with using locally defined attrs in a shared lib"
This reverts commit 5069dd69898bd0d9c69ba2bbd37239ec8d1c9dc6.
The reverted commit caused issues loading resources supplied by static libraries.
Bug 17748356
Change-Id: I860a4f31451ee7c03c02974826472a67226b029f
Diffstat (limited to 'libs/androidfw')
| -rw-r--r-- | libs/androidfw/ResourceTypes.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/libs/androidfw/ResourceTypes.cpp b/libs/androidfw/ResourceTypes.cpp index 61a767c..8cef137 100644 --- a/libs/androidfw/ResourceTypes.cpp +++ b/libs/androidfw/ResourceTypes.cpp @@ -1185,11 +1185,7 @@ uint32_t ResXMLParser::getAttributeNameResID(size_t idx) const { int32_t id = getAttributeNameID(idx); if (id >= 0 && (size_t)id < mTree.mNumResIds) { - uint32_t resId = dtohl(mTree.mResIds[id]); - if (mTree.mDynamicRefTable == NULL || - mTree.mDynamicRefTable->lookupResourceId(&resId) == NO_ERROR) { - return resId; - } + return dtohl(mTree.mResIds[id]); } return 0; } |