diff options
| author | 2016-08-13 00:24:10 +0000 | |
|---|---|---|
| committer | 2016-08-13 00:24:11 +0000 | |
| commit | 6ae8693cd75821afd71c309095d1951a69c677cb (patch) | |
| tree | 0b3adabedd7469a4721d0fbb24e1728fce17121d | |
| parent | 6912cf9b305c5803b16c38ee1e038d57280e0a47 (diff) | |
| parent | c613c63096d9c3e3da8c081210661007d2acf8fb (diff) | |
Merge "Remember all wallpapers' backup-allow state" into nyc-mr1-dev
| -rw-r--r-- | services/core/java/com/android/server/wallpaper/WallpaperManagerService.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java index 71660280162d..64f79e165e75 100644 --- a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java +++ b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java @@ -1400,9 +1400,7 @@ public class WallpaperManagerService extends IWallpaperManager.Stub { wallpaper.whichPending = which; wallpaper.setComplete = completion; wallpaper.cropHint.set(cropHint); - if ((which & FLAG_SYSTEM) != 0) { - wallpaper.allowBackup = allowBackup; - } + wallpaper.allowBackup = allowBackup; } return pfd; } finally { |