diff options
| author | Christian Wailes <chriswailes@google.com> | 2021-04-06 00:02:37 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-04-06 00:02:37 +0000 |
| commit | 0277e97c1203338c0e340176634d4ad6ca1b05d6 (patch) | |
| tree | 5482c00bc8ffd836f99ce2af549285529a2442ed | |
| parent | d0f987eeb029f0a144a831ebcd33c23d19aa1131 (diff) | |
| parent | 09724a755f477301128b5d817757cbc0d5ff2538 (diff) | |
Merge "Register ART Service with the System Server" into sc-dev
| -rw-r--r-- | services/Android.bp | 1 | ||||
| -rw-r--r-- | services/java/com/android/server/SystemServer.java | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/services/Android.bp b/services/Android.bp index 81bb579fdabc..25b270ea1a79 100644 --- a/services/Android.bp +++ b/services/Android.bp @@ -123,6 +123,7 @@ java_library { libs: [ "android.hidl.manager-V1.0-java", "framework-tethering.stubs.module_lib", + "service-art.stubs.system_server", ], // Uncomment to enable output of certain warnings (deprecated, unchecked) diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index 6f71e991bb96..fbf677dd0967 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -103,6 +103,7 @@ import com.android.internal.util.FrameworkStatsLog; import com.android.internal.widget.ILockSettings; import com.android.server.am.ActivityManagerService; import com.android.server.appbinding.AppBindingService; +import com.android.server.art.ArtManagerLocal; import com.android.server.attention.AttentionManagerService; import com.android.server.audio.AudioService; import com.android.server.biometrics.AuthService; @@ -2610,6 +2611,10 @@ public final class SystemServer implements Dumpable { mSystemServiceManager.startService(GAME_MANAGER_SERVICE_CLASS); t.traceEnd(); + t.traceBegin("ArtManagerLocal"); + LocalManagerRegistry.addManager(ArtManagerLocal.class, new ArtManagerLocal()); + t.traceEnd(); + t.traceBegin("StartBootPhaseDeviceSpecificServicesReady"); mSystemServiceManager.startBootPhase(t, SystemService.PHASE_DEVICE_SPECIFIC_SERVICES_READY); t.traceEnd(); |