Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 99966377 authored by Anton Hansson's avatar Anton Hansson Committed by Android (Google) Code Review
Browse files

Merge "RESTRICT AUTOMERGE: Revert "Register ART Service with the System Server"" into sc-v2-dev

parents 0759e7be 46b94ad5

services/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -130,7 +130,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)

services/java/com/android/server/SystemServer.java

+0 −5
Original line number Diff line number Diff line
@@ -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);