diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2016-08-09 00:34:07 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-08-09 00:34:09 +0000 |
| commit | 0b26adbb8b42168d4fc5ef240b1e2730fcfd5c61 (patch) | |
| tree | db7e885bad978bce50a6cedf1c6f167797bcaf9b /packages/WallpaperBackup | |
| parent | d5b0b9bb1f91d1512468e76a403b1de240ab6642 (diff) | |
| parent | dd7110db2b54c59ff758e25a26a06178b57c2469 (diff) | |
Merge "Handle empty/unspecified crop properly in wallpaper restore" into nyc-mr1-dev
Diffstat (limited to 'packages/WallpaperBackup')
| -rw-r--r-- | packages/WallpaperBackup/src/com/android/wallpaperbackup/WallpaperBackupAgent.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/WallpaperBackup/src/com/android/wallpaperbackup/WallpaperBackupAgent.java b/packages/WallpaperBackup/src/com/android/wallpaperbackup/WallpaperBackupAgent.java index 402d9adf0e7c..82b305087707 100644 --- a/packages/WallpaperBackup/src/com/android/wallpaperbackup/WallpaperBackupAgent.java +++ b/packages/WallpaperBackup/src/com/android/wallpaperbackup/WallpaperBackupAgent.java @@ -238,7 +238,7 @@ public class WallpaperBackupAgent extends BackupAgent { Slog.v(TAG, "Restored crop hint " + cropHint); } try (FileInputStream in = new FileInputStream(stage)) { - mWm.setStream(in, cropHint, true, which); + mWm.setStream(in, cropHint.isEmpty() ? null : cropHint, true, which); } finally {} // auto-closes 'in' } } |