commit 2b8bc15d9da76ec598b8c2fac80819d11a596f13
author Lucas Dupin <dupin@google.com> Tue Dec 17 13:14:53 2019 -0800
committer Lucas Dupin <dupin@google.com> Tue Dec 17 21:19:29 2019 +0000
tree 5904bbc31e8fc7209b910282ea16c203938ca495
parent c06564375be8ba7197ac869b0e694ab65bf13b84

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
Merged-In: I4c5151ad6b40d0f0996fdbb825745729cc003425

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java

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 a589ca5..c6dee5e 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
@@ -694,6 +694,8 @@
 
         mKeyguardManager = (KeyguardManager) mContext.getSystemService(Context.KEYGUARD_SERVICE);
         mFalsingManager = Dependency.get(FalsingManager.class);
+        mWallpaperSupported =
+                mContext.getSystemService(WallpaperManager.class).isWallpaperSupported();
 
         // Connect in to the status bar manager service
         mCommandQueue = getComponent(CommandQueue.class);
@@ -708,9 +710,6 @@
 
         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);