From 4ac971346d6e541c4a0e52f4ec107d4a8b04bb85 Mon Sep 17 00:00:00 2001
From: Chris Wailes <chriswailes@google.com>
Date: Tue, 18 May 2021 14:20:29 -0700
Subject: [PATCH] RESTRICT AUTOMERGE: Revert "Register ART Service with the
 System Server"

This reverts commit 09724a755f477301128b5d817757cbc0d5ff2538.

Test: m
Bug: 184281926
Change-Id: I6aa8eff8ab09ef8ebab58bb22f65203cb4349a48
---
 services/Android.bp                                | 1 -
 services/java/com/android/server/SystemServer.java | 5 -----
 2 files changed, 6 deletions(-)

diff --git a/services/Android.bp b/services/Android.bp
index 1dd219264575f..f2e0b203c3fa7 100644
--- a/services/Android.bp
+++ b/services/Android.bp
@@ -141,7 +141,6 @@ 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 7e718e52b7a04..19a6e52208247 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -103,7 +103,6 @@ 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;
@@ -2612,10 +2611,6 @@ 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();
-
         if (context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_UWB)) {
             t.traceBegin("UwbService");
             mSystemServiceManager.startService(UWB_SERVICE_CLASS);