Merge "Fix lock screen wallpaper" into qt-qpr1-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
d52eff6727
@@ -694,6 +694,8 @@ public class StatusBar extends SystemUI implements DemoMode,
|
|||||||
|
|
||||||
mKeyguardManager = (KeyguardManager) mContext.getSystemService(Context.KEYGUARD_SERVICE);
|
mKeyguardManager = (KeyguardManager) mContext.getSystemService(Context.KEYGUARD_SERVICE);
|
||||||
mFalsingManager = Dependency.get(FalsingManager.class);
|
mFalsingManager = Dependency.get(FalsingManager.class);
|
||||||
|
mWallpaperSupported =
|
||||||
|
mContext.getSystemService(WallpaperManager.class).isWallpaperSupported();
|
||||||
|
|
||||||
// Connect in to the status bar manager service
|
// Connect in to the status bar manager service
|
||||||
mCommandQueue = getComponent(CommandQueue.class);
|
mCommandQueue = getComponent(CommandQueue.class);
|
||||||
@@ -708,9 +710,6 @@ public class StatusBar extends SystemUI implements DemoMode,
|
|||||||
|
|
||||||
createAndAddWindows(result);
|
createAndAddWindows(result);
|
||||||
|
|
||||||
mWallpaperSupported =
|
|
||||||
mContext.getSystemService(WallpaperManager.class).isWallpaperSupported();
|
|
||||||
|
|
||||||
if (mWallpaperSupported) {
|
if (mWallpaperSupported) {
|
||||||
// Make sure we always have the most current wallpaper info.
|
// Make sure we always have the most current wallpaper info.
|
||||||
IntentFilter wallpaperChangedFilter = new IntentFilter(Intent.ACTION_WALLPAPER_CHANGED);
|
IntentFilter wallpaperChangedFilter = new IntentFilter(Intent.ACTION_WALLPAPER_CHANGED);
|
||||||
|
|||||||
Reference in New Issue
Block a user