diff options
| author | Steve Kondik <steve@cyngn.com> | 2015-11-04 10:43:28 -0800 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2015-11-04 10:58:59 -0800 |
| commit | 8331d3e508498a19c296fed41b9d4b23ea960031 (patch) | |
| tree | ab450acfb4e38ffdba3ae893a83a052cc0041783 /include | |
| parent | b956432599de00a5edfeccc56615cb03c229c4e9 (diff) | |
| parent | 64a04eb003d2af5bbc84db3062ee4d6a4194c513 (diff) | |
| download | frameworks_base-8331d3e508498a19c296fed41b9d4b23ea960031.zip frameworks_base-8331d3e508498a19c296fed41b9d4b23ea960031.tar.gz frameworks_base-8331d3e508498a19c296fed41b9d4b23ea960031.tar.bz2 | |
Merge branch 'LA.BF64.1.2.2_rb4.6' of git://codeaurora.org/platform/frameworks/base into cm-13.0
Change-Id: I261957864b149edb709e6f76ed382043f9a96936
Diffstat (limited to 'include')
| -rw-r--r-- | include/androidfw/AssetManager.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/androidfw/AssetManager.h b/include/androidfw/AssetManager.h index 13f7951..de10600 100644 --- a/include/androidfw/AssetManager.h +++ b/include/androidfw/AssetManager.h @@ -300,7 +300,7 @@ private: const ResTable* getResTable(bool required = true) const; void setLocaleLocked(const char* locale); void updateResourceParamsLocked() const; - bool appendPathToResTable(const asset_path& ap) const; + bool appendPathToResTable(const asset_path& ap, size_t* entryIdx) const; Asset* openIdmapLocked(const struct asset_path& ap) const; |