From 9b624c186cb6059dfb3ec24bfb6386a0fc17b88c Mon Sep 17 00:00:00 2001 From: Adam Lesinski Date: Wed, 19 Nov 2014 17:49:26 -0800 Subject: AAPT: Move private attrs to new type for framework Private attributes are typically placed after public attributes in the resource table. Each time a new version of the Android framework is released, new public attributes take the place of the private attributes, and the private attributes are shifted after the new public ones. This means that any apps built against the newer SDK may inadvertently be using private attributes on older devices. This change moves all private attributes to a completely different type ID, so there will never be collisions across versions. These private attributes are automatically moved to a synthesized type only for the system resources. Bug:18263655 Change-Id: I7a850512953fadcc9f3524d509cea30249782db8 --- include/androidfw/ResourceTypes.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'include') diff --git a/include/androidfw/ResourceTypes.h b/include/androidfw/ResourceTypes.h index 6b84494..5a28be5 100644 --- a/include/androidfw/ResourceTypes.h +++ b/include/androidfw/ResourceTypes.h @@ -1828,6 +1828,9 @@ private: const ResTable_config* config, Entry* outEntry) const; + uint32_t findEntry(const PackageGroup* group, ssize_t typeIndex, const char16_t* name, + size_t nameLen, uint32_t* outTypeSpecFlags) const; + status_t parsePackage( const ResTable_package* const pkg, const Header* const header); -- cgit v1.1