Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 28f53ee5 authored by Lucas Dupin's avatar Lucas Dupin Committed by Automerger Merge Worker
Browse files

Merge "Fix wallpaper flickering when turning screen off" into rvc-dev am: bce51ad5 am: 86403833 

Change-Id: I0327ab3f369b6063face086a0f5de281aa28611e
parents 6304cca9 86403833

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

+1 −3
Original line number Diff line number Diff line
@@ -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);