diff options
| author | Adam Powell <adamp@google.com> | 2014-10-01 22:37:27 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-01 22:37:27 +0000 |
| commit | e4275843fede011d7ba45cc8cdbf660e86fb6c33 (patch) | |
| tree | 6e85b4addf8bc612202f1b099f4b0aef21b78cf3 /libs/androidfw | |
| parent | 4979a6ade1d46dad1716319725d43b4e9cbb71d3 (diff) | |
| parent | c6a06d437cf2ee7926a01b2f8ee685555bfb3d81 (diff) | |
| download | frameworks_base-e4275843fede011d7ba45cc8cdbf660e86fb6c33.zip frameworks_base-e4275843fede011d7ba45cc8cdbf660e86fb6c33.tar.gz frameworks_base-e4275843fede011d7ba45cc8cdbf660e86fb6c33.tar.bz2 | |
am c6a06d43: Merge "Revert "Fix issue with using locally defined attrs in a shared lib"" into lmp-dev
* commit 'c6a06d437cf2ee7926a01b2f8ee685555bfb3d81':
Revert "Fix issue with using locally defined attrs in a shared lib"
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 38dfe03..f72532f 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; } |