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

Commit c4459238 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 0e820392 8b1e1f92

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

+5 −2
Original line number Diff line number Diff line
@@ -343,6 +343,7 @@ public class StatusBar extends SystemUI implements DemoMode, 
    private BiometricUnlockController mBiometricUnlockController;

    private final LightBarController mLightBarController;

    private final Lazy<LockscreenWallpaper> mLockscreenWallpaperLazy;

    @Nullable

    protected LockscreenWallpaper mLockscreenWallpaper;

    private final AutoHideController mAutoHideController;

    @Nullable
@@ -1059,7 +1060,7 @@ public class StatusBar extends SystemUI implements DemoMode, 


        createNavigationBar(result);



        if (ENABLE_LOCKSCREEN_WALLPAPER) {

        if (ENABLE_LOCKSCREEN_WALLPAPER && mWallpaperSupported) {

            mLockscreenWallpaper = mLockscreenWallpaperLazy.get();

            mLockscreenWallpaper.setHandler(mHandler);

        }
@@ -2807,7 +2808,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);