diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2014-12-04 18:30:25 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-04 18:30:25 +0000 |
| commit | 0953ab276449cf8d2b27d4f68cb213dfe317a3b4 (patch) | |
| tree | fc901a661faa7f4c998af8c853cdeb5ace1d2bb8 /include | |
| parent | 3bf7b80e48eb58254a076f5363f1e9e3348abb8c (diff) | |
| parent | 720beef28dacc924d77576f63fced84e6a820dc6 (diff) | |
| download | frameworks_base-0953ab276449cf8d2b27d4f68cb213dfe317a3b4.zip frameworks_base-0953ab276449cf8d2b27d4f68cb213dfe317a3b4.tar.gz frameworks_base-0953ab276449cf8d2b27d4f68cb213dfe317a3b4.tar.bz2 | |
am 720beef2: Merge "AAPT: Move private attrs to new type for framework" into lmp-mr1-dev
* commit '720beef28dacc924d77576f63fced84e6a820dc6':
AAPT: Move private attrs to new type for framework
Diffstat (limited to 'include')
| -rw-r--r-- | include/androidfw/ResourceTypes.h | 3 |
1 files changed, 3 insertions, 0 deletions
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); |