diff options
| author | Adam Powell <adamp@google.com> | 2014-10-02 12:52:38 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-02 12:52:38 +0000 |
| commit | 29e2e5d2d5815e308443f0fffee18dd1b528968b (patch) | |
| tree | 49d4868ab013d45bdb26084005db35f16c930a3b /libs/androidfw | |
| parent | 9db0d62d96243447960e0d9732e8033ba183b5ce (diff) | |
| parent | e18d68d6ab2f5354441162719ec87cb57de83519 (diff) | |
| download | frameworks_base-29e2e5d2d5815e308443f0fffee18dd1b528968b.zip frameworks_base-29e2e5d2d5815e308443f0fffee18dd1b528968b.tar.gz frameworks_base-29e2e5d2d5815e308443f0fffee18dd1b528968b.tar.bz2 | |
am e18d68d6: am 4e789dbf: am 8628387c: am b226d295: am c6a06d43: Merge "Revert "Fix issue with using locally defined attrs in a shared lib"" into lmp-dev
* commit 'e18d68d6ab2f5354441162719ec87cb57de83519':
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 058ba86..672a8ee 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; } |