From 7296c9365822cefe50cbbfbe0fa0671aa108b69c Mon Sep 17 00:00:00 2001 From: Lucas Dupin Date: Tue, 17 Dec 2019 13:14:53 -0800 Subject: [PATCH] Fix lock screen wallpaper LockscreenWallpaper was set to null on NotificationMediaManager because StatusBar#mWallpaperSupported was not initialized yet. Fixes: 146252300 Test: manual Change-Id: I4c5151ad6b40d0f0996fdbb825745729cc003425 --- .../src/com/android/systemui/statusbar/phone/StatusBar.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java index a9d760185fd69..a1b02ad0d0b34 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java @@ -813,6 +813,8 @@ public class StatusBar extends SystemUI implements DemoMode, ServiceManager.getService(Context.STATUS_BAR_SERVICE)); mKeyguardManager = (KeyguardManager) mContext.getSystemService(Context.KEYGUARD_SERVICE); + mWallpaperSupported = + mContext.getSystemService(WallpaperManager.class).isWallpaperSupported(); // Connect in to the status bar manager service mCommandQueue.addCallback(this); @@ -826,9 +828,6 @@ public class StatusBar extends SystemUI implements DemoMode, createAndAddWindows(result); - mWallpaperSupported = - mContext.getSystemService(WallpaperManager.class).isWallpaperSupported(); - if (mWallpaperSupported) { // Make sure we always have the most current wallpaper info. IntentFilter wallpaperChangedFilter = new IntentFilter(Intent.ACTION_WALLPAPER_CHANGED);