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

Commit 0277e97c authored by Christian Wailes's avatar Christian Wailes Committed by Android (Google) Code Review
Browse files

Merge "Register ART Service with the System Server" into sc-dev

parents d0f987ee 09724a75

services/Android.bp

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

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

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