summaryrefslogtreecommitdiff
path: root/libs
diff options
context:
space:
mode:
author Adam Lesinski <adamlesinski@google.com> 2016-06-14 11:05:23 -0700
committer Adam Lesinski <adamlesinski@google.com> 2016-06-15 12:00:18 -0700
commit25f48886b2bc2f4edc65d80ff836561853b7ed50 (patch)
treeb9e486ce46482b01c5edcdddf2206e4e5f019a08 /libs
parentd749245b88456fcec8be1b93528e179d3a2d61aa (diff)
ResourcesManager: Allow managed addition of library asset paths
This allows WebView to add itself to the ResourcesManager and remain their even after configuration changes and multi-window changes. Bug:29112218 Change-Id: I2cb131ae2c61fb58c48babafdd46c1882be96aa9
Diffstat (limited to 'libs')
-rw-r--r--libs/androidfw/ResourceTypes.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/androidfw/ResourceTypes.cpp b/libs/androidfw/ResourceTypes.cpp
index d447a38c9b90..ceeb12bab205 100644
--- a/libs/androidfw/ResourceTypes.cpp
+++ b/libs/androidfw/ResourceTypes.cpp
@@ -6174,7 +6174,7 @@ status_t ResTable::parsePackage(const ResTable_package* const pkg,
if (id >= 256) {
LOG_ALWAYS_FATAL("Package id out of range");
return NO_ERROR;
- } else if (id == 0 || appAsLib || isSystemAsset) {
+ } else if (id == 0 || (id == 0x7f && appAsLib) || isSystemAsset) {
// This is a library or a system asset, so assign an ID
id = mNextPackageId++;
}