diff options
| author | 2019-09-28 17:42:48 +0000 | |
|---|---|---|
| committer | 2019-09-28 17:42:48 +0000 | |
| commit | 2242fbd4877825c7d56e57561c49ca324db497e2 (patch) | |
| tree | c546c649ada5351b8d6dacc64aa72b6d0478f6bd | |
| parent | a2261e72a8e87926a250209d08bb2e27dfc20a10 (diff) | |
| parent | c53ac0ad2beb7eabd865e7cec5ee81d1b289da8d (diff) | |
Merge "Move statscompanion to statsd-service jar"
| -rw-r--r-- | apex/statsd/service/Android.bp | 16 | ||||
| -rw-r--r-- | apex/statsd/service/java/com/android/server/stats/StatsCompanionService.java (renamed from services/core/java/com/android/server/stats/StatsCompanionService.java) | 0 | ||||
| -rw-r--r-- | services/java/com/android/server/SystemServer.java | 5 |
3 files changed, 19 insertions, 2 deletions
diff --git a/apex/statsd/service/Android.bp b/apex/statsd/service/Android.bp new file mode 100644 index 000000000000..786e8b0260f8 --- /dev/null +++ b/apex/statsd/service/Android.bp @@ -0,0 +1,16 @@ +// 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 diff --git a/services/core/java/com/android/server/stats/StatsCompanionService.java b/apex/statsd/service/java/com/android/server/stats/StatsCompanionService.java index 1d3ac6a9f14f..1d3ac6a9f14f 100644 --- a/services/core/java/com/android/server/stats/StatsCompanionService.java +++ b/apex/statsd/service/java/com/android/server/stats/StatsCompanionService.java diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index 90d0c3051185..e93e17ae7a3c 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -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 |