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

Commit c53ac0ad authored by Tej Singh's avatar Tej Singh
Browse files

Move statscompanion to statsd-service jar 

This moves statscompanion to statsd-service.jar, and out of
services.jar, in preparation to add it to the statsd apex. In later CL's
I will start making the communication to the rest of system server go
accross approved boundaries. I will also make a second service in system
server to put pullers and other things that we do not care about
updating.

Test: builds, boots, statscompanion talks to statsd
Change-Id: Id7c36bfe4c2138edd4a19f3f477ce31c2f1973d3
parent d262c51a

apex/statsd/service/Android.bp

0 → 100644
+16 −0
Original line number Diff line number Diff line 
// Statsd Service jar, which will eventually be put in the statsd mainline apex.

// statsd-service needs to be added to PRODUCT_SYSTEM_SERVER_JARS.

// This jar will contain StatsCompanionService

java_library {

    name: "statsd-service",

    installable: true,



    srcs: [

        "java/**/*.java",

    ],



    libs: [

        "framework",

        "services.core",

    ],

}
 
 No newline at end of file

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

+3 −2
Original line number Diff line number Diff line
@@ -141,7 +141,6 @@ import com.android.server.security.KeyAttestationApplicationIdProviderService; 
import com.android.server.security.KeyChainSystemService;

import com.android.server.signedconfig.SignedConfigService;

import com.android.server.soundtrigger.SoundTriggerService;

import com.android.server.stats.StatsCompanionService;

import com.android.server.statusbar.StatusBarManagerService;

import com.android.server.storage.DeviceStorageMonitorService;

import com.android.server.telecom.TelecomLoaderService;
@@ -202,6 +201,8 @@ public final class SystemServer { 
            "com.android.server.print.PrintManagerService";

    private static final String COMPANION_DEVICE_MANAGER_SERVICE_CLASS =

            "com.android.server.companion.CompanionDeviceManagerService";

    private static final String STATS_COMPANION_SERVICE_LIFECYCLE_CLASS =

            "com.android.server.stats.StatsCompanionService$Lifecycle";

    private static final String USB_SERVICE_CLASS =

            "com.android.server.usb.UsbService$Lifecycle";

    private static final String MIDI_SERVICE_CLASS =
@@ -1875,7 +1876,7 @@ public final class SystemServer { 


        // Statsd helper

        t.traceBegin("StartStatsCompanionService");

        mSystemServiceManager.startService(StatsCompanionService.Lifecycle.class);

        mSystemServiceManager.startService(STATS_COMPANION_SERVICE_LIFECYCLE_CLASS);

        t.traceEnd();



        // Incidentd and dumpstated helper