drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "RRO: prevent duplicate system overlays"

Browse Source
This commit is contained in:
Adam Lesinski
2014-12-03 17:44:17 +00:00
committed by Gerrit Code Review
parent abdaa32dd7 cb7b63d928
commit a2b5067aee
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/androidfw/AssetManager.h
View File

@ -236,9 +236,11 @@ public:
private: private:
struct asset_path struct asset_path
{ {
asset_path() : path(""), type(kFileTypeRegular), idmap(""), isSystemOverlay(false) {}
String8 path; String8 path;
FileType type; FileType type;
String8 idmap; String8 idmap;
bool isSystemOverlay;
}; };
Asset* openInPathLocked(const char* fileName, AccessMode mode, Asset* openInPathLocked(const char* fileName, AccessMode mode,

6
libs/androidfw/AssetManager.cpp
View File

@ -611,6 +611,11 @@ FileType AssetManager::getFileType(const char* fileName)
} }
bool AssetManager::appendPathToResTable(const asset_path& ap) const { bool AssetManager::appendPathToResTable(const asset_path& ap) const {
// skip those ap's that correspond to system overlays
if (ap.isSystemOverlay) {
return true;
}
Asset* ass = NULL; Asset* ass = NULL;
ResTable* sharedRes = NULL; ResTable* sharedRes = NULL;
bool shared = true; bool shared = true;
@ -796,6 +801,7 @@ void AssetManager::addSystemOverlays(const char* pathOverlaysList,
oap.path = String8(buf, space - buf); oap.path = String8(buf, space - buf);
oap.type = kFileTypeRegular; oap.type = kFileTypeRegular;
oap.idmap = String8(space + 1, newline - space - 1); oap.idmap = String8(space + 1, newline - space - 1);
oap.isSystemOverlay = true;
Asset* oass = const_cast<AssetManager*>(this)-> Asset* oass = const_cast<AssetManager*>(this)->
openNonAssetInPathLocked("resources.arsc", openNonAssetInPathLocked("resources.arsc",