Logspam: Properly handle optional app widgets service

If a service is not present and an exeception is thrown in the SystemServiceRegistry, we log a message and proceed with the null service. Optional feature services, like app widgets, are expected to be missing if not supported. Properly handle the lookup, so no exception that pollutes the logs is emitted for what is normal operation. Test: No exception logged with the app widgets feature disabled Upstream from Meta Change-Id: I1cae4f9188ec47b55d68d7c8208f0da1c6c263b4 Signed-off-by: DennySPb <[email protected]>
syberia-project · Dec 19, 2022 · 3f1945f · 3f1945f
1 parent 366b3c9
commit 3f1945f
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/core/java/android/app/SystemServiceRegistry.java b/core/java/android/app/SystemServiceRegistry.java
@@ -1040,9 +1040,10 @@ public MediaProjectionManager createService(ContextImpl ctx) {
         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,