Merge "Retain allowBackup annotation when system+lock wallpaper becomes lock only" into nyc-mr1-dev

2016-10-13 18:51:10 +00:00
parent 669537a9fe edd8dc83d5
commit 4bd56fbbee
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
+++ b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
@@ -1487,7 +1487,7 @@ public class WallpaperManagerService extends IWallpaperManager.Stub {
        lockWP.cropHint.set(sysWP.cropHint);
        lockWP.width = sysWP.width;
        lockWP.height = sysWP.height;
-        lockWP.allowBackup = false;
+        lockWP.allowBackup = sysWP.allowBackup;

        // Migrate the bitmap files outright; no need to copy
        try {