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

Commit b897b173 authored by Wale Ogunwale's avatar Wale Ogunwale
Browse files

Revert "Don't start intelligence services that are not provided by the OEM." 

This reverts commit c6fff252.

Reason for revert: causing WM pre-submit tests to fail on go/wm-tests

Change-Id: I7a6db671f17fb056f29d5e02f58a7da88afda7ed
parent c6fff252

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

+12 −22
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ import static android.view.Display.DEFAULT_DISPLAY; 
import static com.android.server.utils.TimingsTraceAndSlog.SYSTEM_SERVER_TIMING_TAG;



import android.annotation.NonNull;

import android.annotation.StringRes;

import android.app.ActivityThread;

import android.app.INotificationManager;

import android.app.usage.UsageStatsManagerInternal;
@@ -1266,22 +1265,14 @@ public final class SystemServer { 
            startSystemCaptionsManagerService(context, t);



            // App prediction manager service

            if (deviceHasConfigString(context, R.string.config_defaultAppPredictionService)) {

            t.traceBegin("StartAppPredictionService");

            mSystemServiceManager.startService(APP_PREDICTION_MANAGER_SERVICE_CLASS);

            t.traceEnd();

            } else {

                Slog.d(TAG, "AppPredictionService not defined by OEM");

            }



            // Content suggestions manager service

            if (deviceHasConfigString(context, R.string.config_defaultContentSuggestionsService)) {

            t.traceBegin("StartContentSuggestionsService");

            mSystemServiceManager.startService(CONTENT_SUGGESTIONS_SERVICE_CLASS);

            t.traceEnd();

            } else {

                Slog.d(TAG, "ContentSuggestionsService not defined by OEM");

            }



            t.traceBegin("InitNetworkStackClient");

            try {
@@ -2266,14 +2257,11 @@ public final class SystemServer { 
        t.traceEnd(); // startOtherServices

    }



    private boolean deviceHasConfigString(@NonNull Context context, @StringRes int resId) {

        String serviceName = context.getString(resId);

        return !TextUtils.isEmpty(serviceName);

    }



    private void startSystemCaptionsManagerService(@NonNull Context context,

            @NonNull TimingsTraceAndSlog t) {

        if (!deviceHasConfigString(context, R.string.config_defaultSystemCaptionsManagerService)) {

        String serviceName = context.getString(

                com.android.internal.R.string.config_defaultSystemCaptionsManagerService);

        if (TextUtils.isEmpty(serviceName)) {

            Slog.d(TAG, "SystemCaptionsManagerService disabled because resource is not overlaid");

            return;

        }
@@ -2301,7 +2289,9 @@ public final class SystemServer { 


        // Then check if OEM overlaid the resource that defines the service.

        if (!explicitlyEnabled) {

            if (!deviceHasConfigString(context, R.string.config_defaultContentCaptureService)) {

            final String serviceName = context

                    .getString(com.android.internal.R.string.config_defaultContentCaptureService);

            if (TextUtils.isEmpty(serviceName)) {

                Slog.d(TAG, "ContentCaptureService disabled because resource is not overlaid");

                return;

            }