diff options
| author | Christian Wailes <chriswailes@google.com> | 2021-05-24 22:38:59 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-05-24 22:38:59 +0000 |
| commit | 4a998888881cce7e9a6c3b0a79d7e94dc7c98ace (patch) | |
| tree | fae622af458267b04a9183d8033b61658f09119a | |
| parent | a376aeb68f3d14a66c443955afb40672f4733ac7 (diff) | |
| parent | 4ac971346d6e541c4a0e52f4ec107d4a8b04bb85 (diff) | |
Merge "RESTRICT AUTOMERGE: Revert "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, 0 insertions, 6 deletions
diff --git a/services/Android.bp b/services/Android.bp index 1dd219264575..f2e0b203c3fa 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 ad89e96c7438..d487483cfb56 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; @@ -2632,10 +2631,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); |