Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dd7110db authored by Christopher Tate's avatar Christopher Tate
Browse files

Handle empty/unspecified crop properly in wallpaper restore 

Pass 'null' as the crop hint when the crop as expressed in the restored
wallpaper metadata is either unspecified or effectively empty.

Bug 30521402
Bug 30274136

Change-Id: I14e5d2bae1ec30fb27e8fd45b340b2ca87f35a01
parent a6b1a948

packages/WallpaperBackup/src/com/android/wallpaperbackup/WallpaperBackupAgent.java

+1 −1
Original line number Diff line number Diff line
@@ -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'

            }

        }