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

Merge "Test existence of wallpaper files before backing them up" into nyc-mr1-dev

Browse Source
This commit is contained in:
Chris Tate
2016-07-15 01:36:46 +00:00
committed by Android (Google) Code Review
parent f25486f8a5 5f829d287f
commit 8b08553e90
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -114,13 +114,17 @@ public class WallpaperBackupAgent extends BackupAgent {
imageStage.delete();
lockImageStage.delete();
Os.link(mWallpaperInfo.getCanonicalPath(), infoStage.getCanonicalPath());
fullBackupFile(infoStage, data);
Os.link(mWallpaperFile.getCanonicalPath(), imageStage.getCanonicalPath());
fullBackupFile(imageStage, data);
if (mWallpaperInfo.exists()) {
Os.link(mWallpaperInfo.getCanonicalPath(), infoStage.getCanonicalPath());
fullBackupFile(infoStage, data);
}
if (mWallpaperFile.exists()) {
Os.link(mWallpaperFile.getCanonicalPath(), imageStage.getCanonicalPath());
fullBackupFile(imageStage, data);
}
// Don't try to store the lock image if we overran our quota last time
if (!mQuotaExceeded) {
if (mLockWallpaperFile.exists() && !mQuotaExceeded) {
Os.link(mLockWallpaperFile.getCanonicalPath(), lockImageStage.getCanonicalPath());
fullBackupFile(lockImageStage, data);
}
@@ -130,7 +134,7 @@ public class WallpaperBackupAgent extends BackupAgent {
}
}
} catch (Exception e) {
Slog.e(TAG, "Unable to back up wallpaper: " + e.getMessage());
Slog.e(TAG, "Unable to back up wallpaper", e);
} finally {
if (DEBUG) {
Slog.v(TAG, "Removing backup stage links");
@@ -173,6 +177,9 @@ public class WallpaperBackupAgent extends BackupAgent {
final File lockImageStage = new File (filesDir, LOCK_IMAGE_STAGE);
try {
// First off, revert to the factory state
mWm.clear(WallpaperManager.FLAG_SYSTEM | WallpaperManager.FLAG_LOCK);
// It is valid for the imagery to be absent; it means that we were not permitted
// to back up the original image on the source device, or there was no user-supplied
// wallpaper image present.