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

Merge "Add preloading wallpaper to the getWallpaper call." into nyc-dev

Browse Source
This commit is contained in:
Vadim Tryshev
2016-02-20 01:07:54 +00:00
committed by Android (Google) Code Review
parent 11c4fd411a 8cde0798ed
commit d8330cea98
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1087,19 +1087,17 @@ public class WallpaperManagerService extends IWallpaperManager.Stub {
}
synchronized (mLock) {
WallpaperData wallpaper = null;
if (which == FLAG_SET_LOCK) {
wallpaper = mLockWallpaperMap.get(wallpaperUserId);
final SparseArray<WallpaperData> whichSet =
(which == FLAG_SET_LOCK) ? mLockWallpaperMap : mWallpaperMap;
WallpaperData wallpaper = whichSet.get(wallpaperUserId);
if (wallpaper == null) {
// common case, this is the first lookup post-boot of the system or
// unified lock, so we bring up the saved state lazily now and recheck.
loadSettingsLocked(wallpaperUserId);
wallpaper = whichSet.get(wallpaperUserId);
if (wallpaper == null) {
// If you ask for the lock wallpaper specifically and there isn't one,
// we say so rather than returning the system wallpaper as fallback.
return null;
}
} else {
wallpaper = mWallpaperMap.get(wallpaperUserId);
}
if (wallpaper == null) {
return null;
}
try {
if (outParams != null) {