diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2014-09-19 23:28:24 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-19 23:28:24 +0000 |
| commit | 3ae4ac218c56d1603c8b3cc27fe788fea9be4c9f (patch) | |
| tree | db798646e19fb100c7581a90fab95317402e48dd /tools/aapt/ResourceTable.h | |
| parent | 964c1d2fed9ba31a547be39b51100f9bc1ee7b76 (diff) | |
| parent | 0fa7511db2ec1e2326938f92262d00f23876307e (diff) | |
| download | frameworks_base-3ae4ac218c56d1603c8b3cc27fe788fea9be4c9f.zip frameworks_base-3ae4ac218c56d1603c8b3cc27fe788fea9be4c9f.tar.gz frameworks_base-3ae4ac218c56d1603c8b3cc27fe788fea9be4c9f.tar.bz2 | |
am 60040044: am 9ee3ba23: am e7e9ad6d: am 863b1a90: am 19f9d54f: Merge "Fix backwards compat problem with AAPT public attrs" into lmp-dev
* commit '6004004428a93a03657b513d62eeaab660db0896':
Fix backwards compat problem with AAPT public attrs
Diffstat (limited to 'tools/aapt/ResourceTable.h')
| -rw-r--r-- | tools/aapt/ResourceTable.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/tools/aapt/ResourceTable.h b/tools/aapt/ResourceTable.h index 3721de4..025a868 100644 --- a/tools/aapt/ResourceTable.h +++ b/tools/aapt/ResourceTable.h @@ -165,6 +165,8 @@ public: size_t numLocalResources() const; bool hasResources() const; + status_t modifyForCompat(const Bundle* bundle); + sp<AaptFile> flatten(Bundle* bundle, const sp<const ResourceFilter>& filter, const bool isBase); @@ -281,6 +283,9 @@ public: : mName(name), mType(TYPE_UNKNOWN), mItemFormat(ResTable_map::TYPE_ANY), mNameIndex(-1), mPos(pos) { } + + Entry(const Entry& entry); + virtual ~Entry() { } enum type { @@ -311,6 +316,8 @@ public: bool replace=false, bool isId = false, int32_t format = ResTable_map::TYPE_ANY); + status_t removeFromBag(const String16& key); + // Index of the entry's name string in the key pool. int32_t getNameIndex() const { return mNameIndex; } void setNameIndex(int32_t index) { mNameIndex = index; } @@ -523,6 +530,7 @@ private: const Item* getItem(uint32_t resID, uint32_t attrID) const; bool getItemValue(uint32_t resID, uint32_t attrID, Res_value* outValue); + bool isAttributeFromL(uint32_t attrId); String16 mAssetsPackage; |