Merge "Pass the right loading package when registering dex modules" into rvc-dev am: 3ee690f500

Change-Id: Ie43905d026558c8f9eb65586df629db3c66f10b5
This commit is contained in:
TreeHugger Robot
2020-04-30 00:07:05 +00:00
committed by Automerger Merge Worker

View File

@@ -711,7 +711,7 @@ public class DexManager {
for (String isa : getAppDexInstructionSets(info.primaryCpuAbi, info.secondaryCpuAbi)) { for (String isa : getAppDexInstructionSets(info.primaryCpuAbi, info.secondaryCpuAbi)) {
boolean newUpdate = mPackageDexUsage.record(searchResult.mOwningPackageName, boolean newUpdate = mPackageDexUsage.record(searchResult.mOwningPackageName,
dexPath, userId, isa, /*primaryOrSplit*/ false, dexPath, userId, isa, /*primaryOrSplit*/ false,
searchResult.mOwningPackageName, loadingPackage,
PackageDexUsage.VARIABLE_CLASS_LOADER_CONTEXT); PackageDexUsage.VARIABLE_CLASS_LOADER_CONTEXT);
update |= newUpdate; update |= newUpdate;
} }