diff options
| author | Adam Powell <adamp@google.com> | 2014-10-02 12:38:21 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-02 12:38:21 +0000 |
| commit | e18d68d6ab2f5354441162719ec87cb57de83519 (patch) | |
| tree | 2cb0e8c9128ce020d36f04c03fecde706d9f2035 /libs/androidfw | |
| parent | 30c284fc460218652ffa89aed3da41225ad9b7cc (diff) | |
| parent | 4e789dbff0bc4d9c259a33d6e8ea595c0f4d5f35 (diff) | |
| download | frameworks_base-e18d68d6ab2f5354441162719ec87cb57de83519.zip frameworks_base-e18d68d6ab2f5354441162719ec87cb57de83519.tar.gz frameworks_base-e18d68d6ab2f5354441162719ec87cb57de83519.tar.bz2 | |
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 '4e789dbff0bc4d9c259a33d6e8ea595c0f4d5f35':
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; } |