diff options
author | Adam Lesinski <adamlesinski@google.com> | 2014-12-10 21:12:02 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-12-10 21:12:04 +0000 |
commit | c78018774503308e8c8266f6769c9e4c895f3a97 (patch) | |
tree | c8d2e64fbea4fc28907ef345ede9588950c959c2 /include | |
parent | 4ef9edeb67a1aa25b4ec57b9951b8dc4a06c3691 (diff) | |
parent | 5dce5e67dbdcd14882edf3f64fba671c77577ee4 (diff) | |
download | frameworks_base-c78018774503308e8c8266f6769c9e4c895f3a97.zip frameworks_base-c78018774503308e8c8266f6769c9e4c895f3a97.tar.gz frameworks_base-c78018774503308e8c8266f6769c9e4c895f3a97.tar.bz2 |
Merge "Fix issue where non-resource attributes would cause obtainStyleAttributes to fail" into lmp-mr1-dev
Diffstat (limited to 'include')
-rw-r--r-- | include/androidfw/AttributeFinder.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/include/androidfw/AttributeFinder.h b/include/androidfw/AttributeFinder.h index a0ffeb3..acf7056 100644 --- a/include/androidfw/AttributeFinder.h +++ b/include/androidfw/AttributeFinder.h @@ -64,6 +64,7 @@ private: void jumpToClosestAttribute(uint32_t packageId); void markCurrentPackageId(uint32_t packageId); + bool mFirstTime; Iterator mBegin; Iterator mEnd; Iterator mCurrent; @@ -81,7 +82,8 @@ private: template <typename Derived, typename Iterator> inline BackTrackingAttributeFinder<Derived, Iterator>::BackTrackingAttributeFinder(const Iterator& begin, const Iterator& end) - : mBegin(begin) + : mFirstTime(true) + , mBegin(begin) , mEnd(end) , mCurrent(begin) , mLargest(begin) @@ -145,8 +147,11 @@ Iterator BackTrackingAttributeFinder<Derived, Iterator>::find(uint32_t attr) { return mEnd; } - if (mCurrentAttr == 0) { - // One-time initialization. + if (mFirstTime) { + // One-time initialization. We do this here instead of the constructor + // because the derived class we access in getAttribute() may not be + // fully constructed. + mFirstTime = false; mCurrentAttr = static_cast<const Derived*>(this)->getAttribute(mBegin); mLastPackageId = getPackage(mCurrentAttr); markCurrentPackageId(mLastPackageId); |