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

Commit fc4f408c authored by Yeabkal Wubshit's avatar Yeabkal Wubshit Committed by Android (Google) Code Review
Browse files

Merge "Move Wear towards status bar global actions"

parents 54a5fd39 f4d472d3

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

+1 −9
Original line number Diff line number Diff line
@@ -336,8 +336,6 @@ public final class SystemServer implements Dumpable { 
            "com.android.clockwork.display.WearDisplayService";

    private static final String WEAR_TIME_SERVICE_CLASS =

            "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 =
@@ -1887,9 +1885,7 @@ public final class SystemServer implements Dumpable { 
            t.traceBegin("StartStatusBarManagerService");

            try {

                statusBar = new StatusBarManagerService(context);

                if (!isWatch) {

                statusBar.publishGlobalActionsProvider();

                }

                ServiceManager.addService(Context.STATUS_BAR_SERVICE, statusBar, false,

                        DUMP_FLAG_PRIORITY_NORMAL | DUMP_FLAG_PROTO);

            } catch (Throwable e) {
@@ -2609,10 +2605,6 @@ public final class SystemServer implements Dumpable { 
            mSystemServiceManager.startService(WEAR_TIME_SERVICE_CLASS);

            t.traceEnd();



            t.traceBegin("StartWearGlobalActionsService");

            mSystemServiceManager.startService(WEAR_GLOBAL_ACTIONS_SERVICE_CLASS);

            t.traceEnd();



            t.traceBegin("StartWearSettingsService");

            mSystemServiceManager.startService(WEAR_SETTINGS_SERVICE_CLASS);

            t.traceEnd();