Merge "Fix wallpaper backup eligibility test am: f7d1b5de6e" into nyc-mr1-dev

2016-08-23 00:19:41 +00:00
parent f7e165972f 100b610066
commit e022290806
1 changed files with 2 additions and 2 deletions
--- a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
+++ b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
@@ -1757,8 +1757,8 @@ public class WallpaperManagerService extends IWallpaperManager.Stub {
        }

        WallpaperData wallpaper = (which == FLAG_LOCK)
-                ? mWallpaperMap.get(userId)
-                : mLockWallpaperMap.get(userId);
+                ? mLockWallpaperMap.get(userId)
+                : mWallpaperMap.get(userId);
        return (wallpaper != null) ? wallpaper.allowBackup : false;
    }