diff options
| author | 2016-10-13 19:14:06 +0000 | |
|---|---|---|
| committer | 2016-10-13 19:14:08 +0000 | |
| commit | d344b407df69c2dd52bbf5d0ea4e672c2ef95ca2 (patch) | |
| tree | 082ad13cc614c9bf16802f59a7faa6ac14494b19 | |
| parent | ba297baa0412c6e8e9ba6ad54f0ce0990bb60940 (diff) | |
| parent | 8371d28717a9cce2fcceff5cf799cdc0fb3b3c09 (diff) | |
Merge "Retain allowBackup annotation when system+lock wallpaper becomes lock only am: edd8dc83d5 am: 4cb8e2de6f" into nyc-mr1-dev-plus-aosp
| -rw-r--r-- | services/core/java/com/android/server/wallpaper/WallpaperManagerService.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java index 760e298693d4..372094001cf8 100644 --- 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 { |