commit 91fe95135c0dca7b5ac818f95f3f67f0d400e4f9
author Jiakai Zhang <jiakaiz@google.com> Mon Nov 14 19:42:32 2022 +0000
committer Jiakai Zhang <jiakaiz@google.com> Mon Nov 28 16:37:33 2022 +0000
tree 997b92a71f9b6420d9d064cb233e57a93ea21bc0
parent a4070d163fc3446cf459973665a550e666e1bbd7

Move notifyDexContainersLoaded out of ArtManagerLocal.

notifyDexContainersLoaded and other methods in ArtManagerLocal don't
share the same lifetime, so they should be in different classes.

Bug: 254043366
Test: atest ArtServiceTests
Ignore-AOSP-First: ART Services.
Change-Id: I99206f1e8d23926564c75d789730bdefd765a6a5

libartservice/service/java/com/android/server/art/DexOptimizer.java

diff --git a/libartservice/service/java/com/android/server/art/DexOptimizer.java b/libartservice/service/java/com/android/server/art/DexOptimizer.java
index 2096977..21333a5 100644
--- a/libartservice/service/java/com/android/server/art/DexOptimizer.java
+++ b/libartservice/service/java/com/android/server/art/DexOptimizer.java
@@ -37,6 +37,7 @@
 import android.util.Pair;
 
 import com.android.internal.annotations.VisibleForTesting;
+import com.android.server.LocalManagerRegistry;
 import com.android.server.art.model.ArtFlags;
 import com.android.server.art.model.DetailedDexInfo;
 import com.android.server.art.model.OptimizeParams;
@@ -643,8 +644,9 @@
         }
 
         @NonNull
-        public DexUseManager getDexUseManager() {
-            return DexUseManager.getInstance();
+        public DexUseManagerLocal getDexUseManager() {
+            return Objects.requireNonNull(
+                    LocalManagerRegistry.getManager(DexUseManagerLocal.class));
         }
 
         @NonNull