summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Christopher Tate <ctate@google.com> 2016-08-09 00:51:08 +0000
committer android-build-merger <android-build-merger@google.com> 2016-08-09 00:51:08 +0000
commitfbee390c97e08754c1b325652a46a5bf9b889843 (patch)
tree6c9009079344b14d85568518d1169af1593d92f9
parentecab26e47f29e5b38bc521b5f748f0b57da8af05 (diff)
parent2ba9127494244a29483ae97504b9a2eb8c30e35e (diff)
Handle empty/unspecified crop properly in wallpaper restore am: dd7110db2b
am: 2ba9127494 Change-Id: I7644603b3ff7dcbd0c9b43cc170da19172949d15
-rw-r--r--packages/WallpaperBackup/src/com/android/wallpaperbackup/WallpaperBackupAgent.java2
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'
}
}