diff options
| author | Christopher Tate <ctate@google.com> | 2014-10-09 16:46:36 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-09 16:46:36 +0000 |
| commit | 3a8e28c1d7dc474b70e937774de5eba70d528674 (patch) | |
| tree | 042f9c43e7b0562f04bbe95907cdd1d638cc2676 /core/java | |
| parent | 682d77dcf19c2d1a7b26a22e457e53daee6fb212 (diff) | |
| parent | c0a30bcfaecf38ab5b55c53e82505570ffffa71e (diff) | |
am c0a30bcf: Merge "Turn on dimension validation in wallpaper restore" into lmp-dev
* commit 'c0a30bcfaecf38ab5b55c53e82505570ffffa71e':
Turn on dimension validation in wallpaper restore
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/app/backup/WallpaperBackupHelper.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/app/backup/WallpaperBackupHelper.java b/core/java/android/app/backup/WallpaperBackupHelper.java index 68ea9e9603a5..75a523700948 100644 --- a/core/java/android/app/backup/WallpaperBackupHelper.java +++ b/core/java/android/app/backup/WallpaperBackupHelper.java @@ -42,7 +42,7 @@ public class WallpaperBackupHelper extends FileBackupHelperBase implements Backu // If 'true', then apply an acceptable-size heuristic at restore time, dropping back // to the factory default wallpaper if the restored one differs "too much" from the // device's preferred wallpaper image dimensions. - private static final boolean REJECT_OUTSIZED_RESTORE = false; + private static final boolean REJECT_OUTSIZED_RESTORE = true; // This path must match what the WallpaperManagerService uses // TODO: Will need to change if backing up non-primary user's wallpaper |