From 25f48886b2bc2f4edc65d80ff836561853b7ed50 Mon Sep 17 00:00:00 2001 From: Adam Lesinski Date: Tue, 14 Jun 2016 11:05:23 -0700 Subject: 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 --- libs/androidfw/ResourceTypes.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libs') 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++; } -- cgit v1.2.3-59-g8ed1b