summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authoryingying <yingying@codeaurora.org>2014-09-04 10:36:54 +0800
committerShaoxu Liu <shaoxu@codeaurora.org>2015-10-23 17:33:59 +0800
commitf1642d87c5cc6783f5ef16e3cbadbd098f086111 (patch)
treefa7a57c0891ef35e19eed6ec40bed775adc44c40 /include
parentcaaba96fcb34849406e362759931ffa4340a89c5 (diff)
downloadframeworks_base-f1642d87c5cc6783f5ef16e3cbadbd098f086111.zip
frameworks_base-f1642d87c5cc6783f5ef16e3cbadbd098f086111.tar.gz
frameworks_base-f1642d87c5cc6783f5ef16e3cbadbd098f086111.tar.bz2
base: Fix the problems for runtime overlay.
- There is no need to make the string blocking when adding the asset path, as it will be made by the resources. - After adding the overlay path, it also needs to update the string blocks. - Scan all the sub folders for framework overlay res. Change-Id: Iaad019111ae364c319e58dce57dbf4647b38d4c3 CRs-Fixed: 763809
Diffstat (limited to 'include')
-rw-r--r--include/androidfw/AssetManager.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/androidfw/AssetManager.h b/include/androidfw/AssetManager.h
index 0cfd2b1..0cfc270 100644
--- a/include/androidfw/AssetManager.h
+++ b/include/androidfw/AssetManager.h
@@ -280,7 +280,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;