Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Handle empty/unspecified crop properly in wallpaper restore" into nyc-mr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-08-09 00:34:07 +00:00
committed by Android (Google) Code Review
parent d5b0b9bb1f dd7110db2b
commit 0b26adbb8b
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/WallpaperBackup/src/com/android/wallpaperbackup/WallpaperBackupAgent.java
View File

@@ -238,7 +238,7 @@ public class WallpaperBackupAgent extends BackupAgent {
Slog.v(TAG, "Restored crop hint " + cropHint); Slog.v(TAG, "Restored crop hint " + cropHint);
} }
try (FileInputStream in = new FileInputStream(stage)) { 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' } finally {} // auto-closes 'in'
} }
} }