diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2014-12-02 22:52:36 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-12-02 22:52:37 +0000 |
| commit | e89a286541e242ad96705fcdd1fe2c6a9eafb4a0 (patch) | |
| tree | c55e1a0c4cc7a2c22c4bb4dfa190a2fb38f6a3df /libs/androidfw/AssetManager.cpp | |
| parent | acd01ff07668a608cb4890a2ea1533a2397149c8 (diff) | |
| parent | 96198ebae8deab14b434645f628213db492abdbc (diff) | |
Merge changes If2c7e09f,Ie21f227c
* changes:
RRO idmap: pad with 0xffffffff, not 0x00000000
RRO: reintroduce lost ResTable insert of assets
Diffstat (limited to 'libs/androidfw/AssetManager.cpp')
| -rw-r--r-- | libs/androidfw/AssetManager.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libs/androidfw/AssetManager.cpp b/libs/androidfw/AssetManager.cpp index e5c5b108921f..6188edbb2c8f 100644 --- a/libs/androidfw/AssetManager.cpp +++ b/libs/androidfw/AssetManager.cpp @@ -302,6 +302,10 @@ bool AssetManager::addOverlayPath(const String8& packagePath, int32_t* cookie) mAssetPaths.add(oap); *cookie = static_cast<int32_t>(mAssetPaths.size()); + if (mResources != NULL) { + appendPathToResTable(oap); + } + return true; } |