From a611fdc66b1c72c429cc2c8bf70afab9b5825c0b Mon Sep 17 00:00:00 2001 From: Christopher Tate Date: Mon, 19 Sep 2016 14:05:44 -0700 Subject: [PATCH] Always store wallpaper metadata to backup By gating this on system/lock wallpaper imagery state we were inadvertently missing backup state for some live-wallpaper use cases. Bug 31023198 Change-Id: Ie53000453e6618844be7c01766c1b715d14cc713 --- .../com/android/wallpaperbackup/WallpaperBackupAgent.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/WallpaperBackup/src/com/android/wallpaperbackup/WallpaperBackupAgent.java b/packages/WallpaperBackup/src/com/android/wallpaperbackup/WallpaperBackupAgent.java index 3a82f8828b6d8..ff934ef18677a 100644 --- a/packages/WallpaperBackup/src/com/android/wallpaperbackup/WallpaperBackupAgent.java +++ b/packages/WallpaperBackup/src/com/android/wallpaperbackup/WallpaperBackupAgent.java @@ -147,11 +147,12 @@ public class WallpaperBackupAgent extends BackupAgent { } // only back up the wallpapers if we've been told they're eligible - if ((sysEligible || lockEligible) && mWallpaperInfo.exists()) { + if (mWallpaperInfo.exists()) { if (sysChanged || lockChanged || !infoStage.exists()) { if (DEBUG) Slog.v(TAG, "New wallpaper configuration; copying"); FileUtils.copyFileOrThrow(mWallpaperInfo, infoStage); } + if (DEBUG) Slog.v(TAG, "Storing wallpaper metadata"); fullBackupFile(infoStage, data); } if (sysEligible && mWallpaperFile.exists()) { @@ -159,6 +160,7 @@ public class WallpaperBackupAgent extends BackupAgent { if (DEBUG) Slog.v(TAG, "New system wallpaper; copying"); FileUtils.copyFileOrThrow(mWallpaperFile, imageStage); } + if (DEBUG) Slog.v(TAG, "Storing system wallpaper image"); fullBackupFile(imageStage, data); prefs.edit().putInt(SYSTEM_GENERATION, sysGeneration).apply(); } @@ -169,6 +171,7 @@ public class WallpaperBackupAgent extends BackupAgent { if (DEBUG) Slog.v(TAG, "New lock wallpaper; copying"); FileUtils.copyFileOrThrow(mLockWallpaperFile, lockImageStage); } + if (DEBUG) Slog.v(TAG, "Storing lock wallpaper image"); fullBackupFile(lockImageStage, data); prefs.edit().putInt(LOCK_GENERATION, lockGeneration).apply(); }