From 3abb09c7a5bd937cae8a628fbbf037e13cb8c195 Mon Sep 17 00:00:00 2001 From: Jiakai Zhang Date: Tue, 24 May 2022 19:39:35 +0100 Subject: [PATCH] Pass context to ArtManagerLocal. ART Services needs the context for: 1. Getting PowerManager and AppHibernationManager 2. Getting resource strings such as R.string.config_systemUi Bug: 236954191 Test: adb shell pm art optimize-package -m speed-profile -f \ com.google.android.youtube Change-Id: I80ffebdcf6f19e8ef0384f1df5877a79a7bf7384 --- services/java/com/android/server/SystemServer.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index 3402262e34dd8..dbed091f7da2e 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -2201,7 +2201,7 @@ public final class SystemServer implements Dumpable { Slog.e(TAG, "Failure starting HardwarePropertiesManagerService", e); } t.traceEnd(); - + if (!isWatch) { t.traceBegin("StartTwilightService"); mSystemServiceManager.startService(TwilightService.class); @@ -2709,7 +2709,7 @@ public final class SystemServer implements Dumpable { t.traceEnd(); t.traceBegin("ArtManagerLocal"); - LocalManagerRegistry.addManager(ArtManagerLocal.class, new ArtManagerLocal()); + LocalManagerRegistry.addManager(ArtManagerLocal.class, new ArtManagerLocal(context)); t.traceEnd(); if (context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_UWB)) {