Merge "Don't set mLockscreenWallpaper when wallpaper is not supported." into qt-qpr1-dev (d439f54b) · Commits · e / os / android_frameworks_base

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

+5 −2

Original line number	Diff line number	Diff line
		@@ -344,6 +344,7 @@ public class StatusBar extends SystemUI implements DemoMode,
		private boolean mBrightnessMirrorVisible;
		protected BiometricUnlockController mBiometricUnlockController;
		protected LightBarController mLightBarController;
		@Nullable
		protected LockscreenWallpaper mLockscreenWallpaper;
		@VisibleForTesting
		protected AutoHideController mAutoHideController;
		@@ -891,7 +892,7 @@ public class StatusBar extends SystemUI implements DemoMode,

		createNavigationBar(result);

		if (ENABLE_LOCKSCREEN_WALLPAPER) {
		if (ENABLE_LOCKSCREEN_WALLPAPER && mWallpaperSupported) {
		mLockscreenWallpaper = new LockscreenWallpaper(mContext, this, mHandler);
		}

		@@ -2748,7 +2749,9 @@ public class StatusBar extends SystemUI implements DemoMode,

		@Override
		public void setLockscreenUser(int newUserId) {
		if (mLockscreenWallpaper != null) {
		mLockscreenWallpaper.setCurrentUser(newUserId);
		}
		mScrimController.setCurrentUser(newUserId);
		if (mWallpaperSupported) {
		mWallpaperChangedReceiver.onReceive(mContext, null);