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

Merge "Fix wallpaper backup eligibility test" into nyc-dr1-dev

Browse Source
This commit is contained in:
Chris Tate
2016-08-22 18:28:04 +00:00
committed by Android (Google) Code Review
parent 051d6b74eb f7d1b5de6e
commit 56ce19099d
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1757,8 +1757,8 @@ public class WallpaperManagerService extends IWallpaperManager.Stub {
} }
WallpaperData wallpaper = (which == FLAG_LOCK) WallpaperData wallpaper = (which == FLAG_LOCK)
? mWallpaperMap.get(userId) ? mLockWallpaperMap.get(userId)
: mLockWallpaperMap.get(userId); : mWallpaperMap.get(userId);
return (wallpaper != null) ? wallpaper.allowBackup : false; return (wallpaper != null) ? wallpaper.allowBackup : false;
} }