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

Commit dd475a2b authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Don't set mLockscreenWallpaper when wallpaper is not supported." into... 

Merge "Don't set mLockscreenWallpaper when wallpaper is not supported." into qt-qpr1-dev am: d439f54b

Change-Id: Iaa49901af2b63a097c269869b4aee5792cb5f61a
parents 9c880774 d439f54b

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