Merge "Start IoT System Service from SystemServer"

This commit is contained in:
TreeHugger Robot
2017-10-19 18:47:02 +00:00
committed by Android (Google) Code Review

View File

@@ -206,7 +206,8 @@ public final class SystemServer {
"com.android.server.autofill.AutofillManagerService";
private static final String TIME_ZONE_RULES_MANAGER_SERVICE_CLASS =
"com.android.server.timezone.RulesManagerService$Lifecycle";
private static final String IOT_SERVICE_CLASS =
"com.google.android.things.services.IoTSystemService";
private static final String PERSISTENT_DATA_BLOCK_PROP = "ro.frp.pst";
private static final String UNCRYPT_PACKAGE_FILE = "/cache/recovery/uncrypt_file";
@@ -1544,6 +1545,12 @@ public final class SystemServer {
traceEnd();
}
if (context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_EMBEDDED)) {
traceBeginAndSlog("StartIoTSystemService");
mSystemServiceManager.startService(IOT_SERVICE_CLASS);
traceEnd();
}
// Statsd helper
traceBeginAndSlog("StartStatsCompanionService");
mSystemServiceManager.startService(StatsCompanionService.Lifecycle.class);