summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Lucas Dupin <dupin@google.com> 2019-12-17 13:14:53 -0800
committer Lucas Dupin <dupin@google.com> 2019-12-17 21:19:29 +0000
commit2b8bc15d9da76ec598b8c2fac80819d11a596f13 (patch)
tree5904bbc31e8fc7209b910282ea16c203938ca495
parentc06564375be8ba7197ac869b0e694ab65bf13b84 (diff)
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
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java5
1 files 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 a589ca588fa7..c6dee5e9bdf5 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 @@ public class StatusBar extends SystemUI implements DemoMode,
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 @@ 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);