Merge "Fix wallpaper flickering when turning screen off" into rvc-dev am: bce51ad5b5 am: 8640383335

Change-Id: I0327ab3f369b6063face086a0f5de281aa28611e
This commit is contained in:
Lucas Dupin
2020-04-12 19:01:04 +00:00
committed by Automerger Merge Worker

View File

@@ -488,11 +488,9 @@ public class StatusBar extends SystemUI implements DemoMode,
WallpaperInfo info = wallpaperManager.getWallpaperInfo(UserHandle.USER_CURRENT);
final boolean deviceSupportsAodWallpaper = mContext.getResources().getBoolean(
com.android.internal.R.bool.config_dozeSupportsAodWallpaper);
final boolean imageWallpaperInAmbient = !mDozeParameters.getDisplayNeedsBlanking();
// If WallpaperInfo is null, it must be ImageWallpaper.
final boolean supportsAmbientMode = deviceSupportsAodWallpaper
&& ((info == null && imageWallpaperInAmbient)
|| (info != null && info.supportsAmbientMode()));
&& (info != null && info.supportsAmbientMode());
mNotificationShadeWindowController.setWallpaperSupportsAmbientMode(supportsAmbientMode);
mScrimController.setWallpaperSupportsAmbientMode(supportsAmbientMode);