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

Commit 18149e70 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Logspam: Properly handle optional app widgets service" am: d85adb46 am: a9acc019 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2276551



Change-Id: Ice28df3ad362c1677b7ea4be6fa3f5e4327eaddc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3514f3ae a9acc019

core/java/android/app/SystemServiceRegistry.java

+4 −3
Original line number Diff line number Diff line
@@ -1027,9 +1027,10 @@ public final class SystemServiceRegistry { 
        registerService(Context.APPWIDGET_SERVICE, AppWidgetManager.class,

                new CachedServiceFetcher<AppWidgetManager>() {

            @Override

            public AppWidgetManager createService(ContextImpl ctx) throws ServiceNotFoundException {

                IBinder b = ServiceManager.getServiceOrThrow(Context.APPWIDGET_SERVICE);

                return new AppWidgetManager(ctx, IAppWidgetService.Stub.asInterface(b));

            public AppWidgetManager createService(ContextImpl ctx) {

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

                return b == null ? null : new AppWidgetManager(ctx,

                        IAppWidgetService.Stub.asInterface(b));

            }});



        registerService(Context.MIDI_SERVICE, MidiManager.class,