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

Always store wallpaper metadata to backup

Browse Source 
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
This commit is contained in:
Christopher Tate
2016-09-19 14:05:44 -07:00
parent 3dfd09e860
commit a611fdc66b
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -147,11 +147,12 @@ public class WallpaperBackupAgent extends BackupAgent {
} }
// only back up the wallpapers if we've been told they're eligible // 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 (sysChanged || lockChanged || !infoStage.exists()) {
if (DEBUG) Slog.v(TAG, "New wallpaper configuration; copying"); if (DEBUG) Slog.v(TAG, "New wallpaper configuration; copying");
FileUtils.copyFileOrThrow(mWallpaperInfo, infoStage); FileUtils.copyFileOrThrow(mWallpaperInfo, infoStage);
} }
if (DEBUG) Slog.v(TAG, "Storing wallpaper metadata");
fullBackupFile(infoStage, data); fullBackupFile(infoStage, data);
} }
if (sysEligible && mWallpaperFile.exists()) { if (sysEligible && mWallpaperFile.exists()) {
@@ -159,6 +160,7 @@ public class WallpaperBackupAgent extends BackupAgent {
if (DEBUG) Slog.v(TAG, "New system wallpaper; copying"); if (DEBUG) Slog.v(TAG, "New system wallpaper; copying");
FileUtils.copyFileOrThrow(mWallpaperFile, imageStage); FileUtils.copyFileOrThrow(mWallpaperFile, imageStage);
} }
if (DEBUG) Slog.v(TAG, "Storing system wallpaper image");
fullBackupFile(imageStage, data); fullBackupFile(imageStage, data);
prefs.edit().putInt(SYSTEM_GENERATION, sysGeneration).apply(); 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"); if (DEBUG) Slog.v(TAG, "New lock wallpaper; copying");
FileUtils.copyFileOrThrow(mLockWallpaperFile, lockImageStage); FileUtils.copyFileOrThrow(mLockWallpaperFile, lockImageStage);
} }
if (DEBUG) Slog.v(TAG, "Storing lock wallpaper image");
fullBackupFile(lockImageStage, data); fullBackupFile(lockImageStage, data);
prefs.edit().putInt(LOCK_GENERATION, lockGeneration).apply(); prefs.edit().putInt(LOCK_GENERATION, lockGeneration).apply();
} }