From e4ed9c5501f1c37aeead34408577507efa1e3d21 Mon Sep 17 00:00:00 2001 From: Jiakai Zhang Date: Tue, 20 Dec 2022 13:13:47 +0000 Subject: [PATCH] Pass Context to DexUseManagerLocal and notify it about boot complete. Bug: 249984283 Test: Presubmit Change-Id: Ib9c13f13dcbb100b1ee216974dcdcdd64b81ae8b --- .../java/com/android/server/pm/PackageManagerService.java | 5 +++++ services/java/com/android/server/SystemServer.java | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index c1298ffd2d61a..60827f0e1c3d1 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -4270,6 +4270,11 @@ public class PackageManagerService implements PackageSender, TestUtilityService // Prune unused static shared libraries which have been cached a period of time schedulePruneUnusedStaticSharedLibraries(false /* delay */); + + DexUseManagerLocal dexUseManager = DexOptHelper.getDexUseManagerLocal(); + if (dexUseManager != null) { + dexUseManager.systemReady(); + } } //TODO: b/111402650 diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index 5b9460a226bb9..5ebf6cec4d5c4 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -1250,7 +1250,7 @@ public final class SystemServer implements Dumpable { // DexUseManagerLocal needs to be loaded after PackageManagerLocal has been registered, but // before PackageManagerService starts processing binder calls to notifyDexLoad. LocalManagerRegistry.addManager( - DexUseManagerLocal.class, DexUseManagerLocal.createInstance()); + DexUseManagerLocal.class, DexUseManagerLocal.createInstance(mSystemContext)); t.traceEnd(); if (!mRuntimeRestart && !isFirstBootOrUpgrade()) {