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

Commit 42b2ec63 authored by Nikolas Havrikov's avatar Nikolas Havrikov Committed by Android (Google) Code Review
Browse files

Merge "Do not start SelectionToolbarManagerService on TV"

parents 86924699 23fde2c3

core/java/android/app/SystemServiceRegistry.java

+4 −2
Original line number Diff line number Diff line
@@ -382,8 +382,10 @@ public final class SystemServiceRegistry { 
        registerService(Context.SELECTION_TOOLBAR_SERVICE, SelectionToolbarManager.class,

                new CachedServiceFetcher<SelectionToolbarManager>() {

                    @Override

                    public SelectionToolbarManager createService(ContextImpl ctx) {

                        IBinder b = ServiceManager.getService(Context.SELECTION_TOOLBAR_SERVICE);

                    public SelectionToolbarManager createService(ContextImpl ctx)

                            throws ServiceNotFoundException {

                        IBinder b = ServiceManager.getServiceOrThrow(

                                Context.SELECTION_TOOLBAR_SERVICE);

                        return new SelectionToolbarManager(ctx.getOuterContext(),

                                ISelectionToolbarManager.Stub.asInterface(b));

                    }});

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

+6 −4
Original line number Diff line number Diff line
@@ -2714,10 +2714,12 @@ public final class SystemServer implements Dumpable { 
            Slog.d(TAG, "TranslationService not defined by OEM");

        }



        if (!isTv) {

            // Selection toolbar service

            t.traceBegin("StartSelectionToolbarManagerService");

            mSystemServiceManager.startService(SELECTION_TOOLBAR_MANAGER_SERVICE_CLASS);

            t.traceEnd();

        }



        // NOTE: ClipboardService depends on ContentCapture and Autofill

        t.traceBegin("StartClipboardService");