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

Commit 95ead463 authored by Eric Rahm's avatar Eric Rahm Committed by Android (Google) Code Review
Browse files

Merge "Init WearSettingsService"

parents 7cea15d4 b8c40749

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

+6 −0
Original line number Diff line number Diff line
@@ -336,6 +336,8 @@ public final class SystemServer implements Dumpable { 
            "com.android.clockwork.time.WearTimeService";

    private static final String WEAR_GLOBAL_ACTIONS_SERVICE_CLASS =

            "com.android.clockwork.globalactions.GlobalActionsService";

    private static final String WEAR_SETTINGS_SERVICE_CLASS =

            "com.android.clockwork.settings.WearSettingsService";

    private static final String ACCOUNT_SERVICE_CLASS =

            "com.android.server.accounts.AccountManagerService$Lifecycle";

    private static final String CONTENT_SERVICE_CLASS =
@@ -2604,6 +2606,10 @@ public final class SystemServer implements Dumpable { 
            t.traceBegin("StartWearGlobalActionsService");

            mSystemServiceManager.startService(WEAR_GLOBAL_ACTIONS_SERVICE_CLASS);

            t.traceEnd();



            t.traceBegin("StartWearSettingsService");

            mSystemServiceManager.startService(WEAR_SETTINGS_SERVICE_CLASS);

            t.traceEnd();

        }



        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_SLICES_DISABLED)) {