From 9e41435ec3226dfe8264314f934f5c2cebee2500 Mon Sep 17 00:00:00 2001 From: Dave Mankoff Date: Tue, 22 Oct 2019 14:45:21 -0400 Subject: [PATCH] Mark SystemServicesModule.provideIWallPaperManager as @Nullable. Bug: 143147815 Test: manual Change-Id: Ifeb0651fe36883be60fa1c4688555a678471224b --- .../android/systemui/dagger/SystemServicesModule.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/dagger/SystemServicesModule.java b/packages/SystemUI/src/com/android/systemui/dagger/SystemServicesModule.java index 434e2d3f47919..891bf615b8f42 100644 --- a/packages/SystemUI/src/com/android/systemui/dagger/SystemServicesModule.java +++ b/packages/SystemUI/src/com/android/systemui/dagger/SystemServicesModule.java @@ -58,12 +58,13 @@ public class SystemServicesModule { @Singleton @Provides - static IActivityManager providesIActivityManager() { + static IActivityManager provideIActivityManager() { return ActivityManager.getService(); } @Provides - static IWallpaperManager provideWallPaperManager() { + @Nullable + static IWallpaperManager provideIWallPaperManager() { return IWallpaperManager.Stub.asInterface( ServiceManager.getService(Context.WALLPAPER_SERVICE)); } @@ -109,13 +110,13 @@ public class SystemServicesModule { } @Provides - static WallpaperManager providesWallpaperManager(Context context) { + static WallpaperManager provideWallpaperManager(Context context) { return (WallpaperManager) context.getSystemService(Context.WALLPAPER_SERVICE); } @Singleton @Provides - static WindowManager providesWindowManager(Context context) { + static WindowManager provideWindowManager(Context context) { return context.getSystemService(WindowManager.class); }