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

Commit d259ca97 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove android.server.telemetry_apis_service flag" into main

parents 61e5d8e4 411ae373

core/java/android/app/ActivityThread.java

+1 −3
Original line number Diff line number Diff line
@@ -9245,10 +9245,8 @@ public final class ActivityThread extends ClientTransactionHandler 
        NfcFrameworkInitializer.setNfcServiceManager(new NfcServiceManager());

        DeviceConfigInitializer.setDeviceConfigServiceManager(new DeviceConfigServiceManager());

        SeFrameworkInitializer.setSeServiceManager(new SeServiceManager());

        if (android.server.Flags.telemetryApisService()) {

        ProfilingFrameworkInitializer.setProfilingServiceManager(new ProfilingServiceManager());

    }

    }



    private void purgePendingResources() {

        Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "purgePendingResources");

core/java/android/app/SystemServiceRegistry.java

+1 −3
Original line number Diff line number Diff line
@@ -1973,9 +1973,7 @@ public final class SystemServiceRegistry { 
            if (android.permission.flags.Flags.enhancedConfirmationModeApisEnabled()) {

                EnhancedConfirmationFrameworkInitializer.registerServiceWrappers();

            }

            if (android.server.Flags.telemetryApisService()) {

            ProfilingFrameworkInitializer.registerServiceWrappers();

            }

            if (android.os.profiling.anomaly.flags.Flags.anomalyDetectorCore()) {

                AnomalyDetectorFrameworkInitializer.registerServiceWrappers();

            }

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

+4 −6
Original line number Diff line number Diff line
@@ -2951,12 +2951,10 @@ public final class SystemServer implements Dumpable { 
        }



        // Profiling

        if (android.server.Flags.telemetryApisService()) {

        t.traceBegin("StartProfilingCompanion");

        mSystemServiceManager.startServiceFromJar(PROFILING_SERVICE_LIFECYCLE_CLASS,

                PROFILING_SERVICE_JAR_PATH);

        t.traceEnd();

        }



        // Anomaly Detector

        if (android.os.profiling.anomaly.flags.Flags.anomalyDetectorCore()) {

services/java/com/android/server/flags.aconfig

+0 −8
Original line number Diff line number Diff line 
package: "android.server"

container: "system"



flag {

     namespace: "system_performance"

     name: "telemetry_apis_service"

     description: "Control service portion of telemetry APIs feature."

     is_fixed_read_only: true

     bug: "324153471"

}



flag {

     name: "remove_text_service"

     namespace: "wear_frameworks"