From 08225a93fcb22c384e201d868ac5d1a55c0beca6 Mon Sep 17 00:00:00 2001
From: Calin Juravle <calin@google.com>
Date: Tue, 14 Apr 2020 18:18:51 -0700
Subject: [PATCH] Pass the right loading package when registering dex modules

We computed the right value, but did not update the registration
arguments.

Test: manual, DexManagerTests
Bug: 148774920
Change-Id: I98cef1d0a9b5431c181db3a9181a5a0958fe9b6a
---
 services/core/java/com/android/server/pm/dex/DexManager.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/pm/dex/DexManager.java b/services/core/java/com/android/server/pm/dex/DexManager.java
index 95a81f099e2db..3074250950f75 100644
--- a/services/core/java/com/android/server/pm/dex/DexManager.java
+++ b/services/core/java/com/android/server/pm/dex/DexManager.java
@@ -711,7 +711,7 @@ public class DexManager {
         for (String isa : getAppDexInstructionSets(info.primaryCpuAbi, info.secondaryCpuAbi)) {
             boolean newUpdate = mPackageDexUsage.record(searchResult.mOwningPackageName,
                     dexPath, userId, isa, /*primaryOrSplit*/ false,
-                    searchResult.mOwningPackageName,
+                    loadingPackage,
                     PackageDexUsage.VARIABLE_CLASS_LOADER_CONTEXT);
             update |= newUpdate;
         }