diff options
author | Adam Lesinski <adamlesinski@google.com> | 2014-12-05 11:06:21 -0800 |
---|---|---|
committer | Adam Lesinski <adamlesinski@google.com> | 2014-12-05 11:06:21 -0800 |
commit | e97908d32ee8ea80138d085260a0eac93841c722 (patch) | |
tree | 0fb24cd7ef6cf6236d3451296937262b78fe2efc /include | |
parent | 501bf216dc9068c8169687437d8d6594cd1e1165 (diff) | |
parent | 0953ab276449cf8d2b27d4f68cb213dfe317a3b4 (diff) | |
download | frameworks_base-e97908d32ee8ea80138d085260a0eac93841c722.zip frameworks_base-e97908d32ee8ea80138d085260a0eac93841c722.tar.gz frameworks_base-e97908d32ee8ea80138d085260a0eac93841c722.tar.bz2 |
Merge commit '0953ab27' into manualmerge
Change-Id: I36dea45f7571096136ea7bda5e2680bd85a0df32
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 ba72cd5..de73254 100644 --- a/include/androidfw/ResourceTypes.h +++ b/include/androidfw/ResourceTypes.h @@ -1826,6 +1826,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); |