From 30113131fb958850ef92c6a8f7f2aa2ed92a8ffe Mon Sep 17 00:00:00 2001 From: Mårten Kongstad Date: Fri, 7 Nov 2014 10:52:17 +0100 Subject: RRO: reintroduce lost ResTable insert of assets With the recent introduction of AssetManager::appendPathToResTable, overlay packages were not properly added to the AssetManager, and once added, were not properly inserted into the ResTable. Bug: 17765434 Change-Id: Ie21f227c654c98730f74a687d0e16ee2b80e747e --- libs/androidfw/AssetManager.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'libs/androidfw') diff --git a/libs/androidfw/AssetManager.cpp b/libs/androidfw/AssetManager.cpp index de6a33cf15e7..a1f78589b804 100644 --- a/libs/androidfw/AssetManager.cpp +++ b/libs/androidfw/AssetManager.cpp @@ -296,6 +296,10 @@ bool AssetManager::addOverlayPath(const String8& packagePath, int32_t* cookie) mAssetPaths.add(oap); *cookie = static_cast(mAssetPaths.size()); + if (mResources != NULL) { + appendPathToResTable(oap); + } + return true; } -- cgit v1.2.3-59-g8ed1b From 96198ebae8deab14b434645f628213db492abdbc Mon Sep 17 00:00:00 2001 From: Mårten Kongstad Date: Fri, 7 Nov 2014 10:56:12 +0100 Subject: RRO idmap: pad with 0xffffffff, not 0x00000000 In the new idmap format (version 0x1), 0x00000000 no longer represents a non-existing entry: 0xffffffff should be used instead. Bug: 17765434 Change-Id: If2c7e09feba2224eeafe88fd9230e6392d81b9a7 --- libs/androidfw/ResourceTypes.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'libs/androidfw') diff --git a/libs/androidfw/ResourceTypes.cpp b/libs/androidfw/ResourceTypes.cpp index 825071a61924..ebdd1676502f 100644 --- a/libs/androidfw/ResourceTypes.cpp +++ b/libs/androidfw/ResourceTypes.cpp @@ -6080,14 +6080,14 @@ status_t ResTable::createIdmap(const ResTable& overlay, } if (typeMap.entryOffset + typeMap.entryMap.size() < entryIndex) { - // Resize to accomodate this entry and the 0's in between. - if (typeMap.entryMap.resize((entryIndex - typeMap.entryOffset) + 1) < 0) { + // pad with 0xffffffff's (indicating non-existing entries) before adding this entry + size_t index = typeMap.entryMap.size(); + size_t numItems = entryIndex - (typeMap.entryOffset + index); + if (typeMap.entryMap.insertAt(0xffffffff, index, numItems) < 0) { return NO_MEMORY; } - typeMap.entryMap.editTop() = Res_GETENTRY(overlayResID); - } else { - typeMap.entryMap.add(Res_GETENTRY(overlayResID)); } + typeMap.entryMap.add(Res_GETENTRY(overlayResID)); } if (!typeMap.entryMap.isEmpty()) { -- cgit v1.2.3-59-g8ed1b