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

Commit a47fcc97 authored by wilsonshih's avatar wilsonshih
Browse files

Reload wallpaper after user unlock. 

Live wallpaper may not support direct-boot aware, however, those kind of wallpapers should be showed after user unlock.
It may not suit to call switchUser after onUnlockUser since there is no user switch happen.

Bug: 78539162
Test: Manual test, reboot and switch users.
Change-Id: I99f8ad99c913ac05bc51c38c3da5aa51c0ba98fd
parent 8f5b3f19

services/core/java/com/android/server/wallpaper/WallpaperManagerService.java

+4 −2
Original line number Diff line number Diff line
@@ -1303,8 +1303,10 @@ public class WallpaperManagerService extends IWallpaperManager.Stub 
        synchronized (mLock) {

            if (mCurrentUserId == userId) {

                if (mWaitingForUnlock) {

                    // If we're switching users, now is when we transition the wallpaper

                    switchUser(userId, null);

                    // the desired wallpaper is not direct-boot aware, load it now

                    final WallpaperData systemWallpaper =

                            getWallpaperSafeLocked(userId, FLAG_SYSTEM);

                    switchWallpaper(systemWallpaper, null);

                }



                // Make sure that the SELinux labeling of all the relevant files is correct.