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

Commit 23fde2c3 authored by Nikolas Havrikov's avatar Nikolas Havrikov
Browse files

Do not start SelectionToolbarManagerService on TV 

Test: build+flash, wait for launcher, inspect logcat for related errors
Bug: 264411203
Change-Id: Ic881a4d4270b1b4e9057ddcfe2c916e4a1030725
parent 6d637b01

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");