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

Commit 5b77c3c8 authored by Chen Bai's avatar Chen Bai Committed by Android (Google) Code Review
Browse files

Merge "boot ac: make AmbientContextManagerService optional"

parents 7d7e3256 146dc70a

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

+11 −8
Original line number Diff line number Diff line
@@ -106,7 +106,6 @@ import com.android.internal.util.FrameworkStatsLog; 
import com.android.internal.widget.ILockSettings;

import com.android.internal.widget.LockSettingsInternal;

import com.android.server.am.ActivityManagerService;

import com.android.server.ambientcontext.AmbientContextManagerService;

import com.android.server.appbinding.AppBindingService;

import com.android.server.appop.AppOpMigrationHelper;

import com.android.server.appop.AppOpMigrationHelperImpl;
@@ -356,6 +355,8 @@ public final class SystemServer implements Dumpable { 
            "com.android.server.selectiontoolbar.SelectionToolbarManagerService";

    private static final String MUSIC_RECOGNITION_MANAGER_SERVICE_CLASS =

            "com.android.server.musicrecognition.MusicRecognitionManagerService";

    private static final String AMBIENT_CONTEXT_MANAGER_SERVICE_CLASS =

            "com.android.server.ambientcontext.AmbientContextManagerService";

    private static final String SYSTEM_CAPTIONS_MANAGER_SERVICE_CLASS =

            "com.android.server.systemcaptions.SystemCaptionsManagerService";

    private static final String TEXT_TO_SPEECH_MANAGER_SERVICE_CLASS =
@@ -1908,9 +1909,17 @@ public final class SystemServer implements Dumpable { 
            startRotationResolverService(context, t);

            startSystemCaptionsManagerService(context, t);

            startTextToSpeechManagerService(context, t);

            startAmbientContextService(t);

            startWearableSensingService(t);



            if (deviceHasConfigString(

                    context, R.string.config_defaultAmbientContextDetectionService)) {

                t.traceBegin("StartAmbientContextService");

                mSystemServiceManager.startService(AMBIENT_CONTEXT_MANAGER_SERVICE_CLASS);

                t.traceEnd();

            } else {

                Slog.d(TAG, "AmbientContextManagerService not defined by OEM or disabled by flag");

            }



            // System Speech Recognition Service

            t.traceBegin("StartSpeechRecognitionManagerService");

            mSystemServiceManager.startService(SPEECH_RECOGNITION_MANAGER_SERVICE_CLASS);
@@ -3311,12 +3320,6 @@ public final class SystemServer implements Dumpable { 


    }



    private void startAmbientContextService(@NonNull TimingsTraceAndSlog t) {

        t.traceBegin("StartAmbientContextService");

        mSystemServiceManager.startService(AmbientContextManagerService.class);

        t.traceEnd();

    }



    private void startWearableSensingService(@NonNull TimingsTraceAndSlog t) {

        t.traceBegin("startWearableSensingService");

        mSystemServiceManager.startService(WearableSensingManagerService.class);