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

Commit d8727bd9 authored by Wei Sheng Shih's avatar Wei Sheng Shih Committed by android-build-merger
Browse files

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

am: 42e687a6

Change-Id: I75941068d26709dd4184830cc4543389fe54f287
parents 4d2e130f 42e687a6
Loading
Loading
Loading
Loading
+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.