commit 2f836303bbc92887c1231a2e5798d7acc53d0f69
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Dec 18 00:45:30 2019 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Dec 18 00:45:30 2019 +0000
tree 07b80f5ea17e7bab5acf973860c9d35d0897b494
parent cf9aa18dd68de3605777563ea950725409bbbef8
parent d52eff672729e7bf6735b969e96d3d2f5c307afb

Merge "Fix lock screen wallpaper" into qt-qpr1-dev am: d52eff6727

Change-Id: Iea22d8378b4743c182f5b9e14b6318741aeb9c3c

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);