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

Commit f687efc4 authored by Wei Sheng Shih's avatar Wei Sheng Shih Committed by Android (Google) Code Review
Browse files

Merge "Reload wallpaper after user unlock." into pi-dev

parents 872a039a a47fcc97

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

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

        synchronized (mLock) {

            if (mCurrentUserId == userId) {

            if (mCurrentUserId == userId) {

                if (mWaitingForUnlock) {

                if (mWaitingForUnlock) {

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

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

                    switchUser(userId, null);

                    final WallpaperData systemWallpaper =

                            getWallpaperSafeLocked(userId, FLAG_SYSTEM);

                    switchWallpaper(systemWallpaper, null);

                }

                }





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

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