Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: f687efc455

Change-Id: Ifa0d5f895999f43a759e7322262f26aa97543d3d
This commit is contained in:
Wei Sheng Shih
2018-05-07 21:23:53 -07:00
committed by android-build-merger
parent aae778c669 f687efc455
commit 42e687a61a
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
View File

@@ -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.