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

Commit 2d3365e1 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Start IoT System Service from SystemServer"

parents c35ca6de 1bfe59d1

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

+8 −1
Original line number Diff line number Diff line
@@ -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);