Merge "Log important events in WallpaperBackupAgent" into rvc-dev
diff --git a/packages/WallpaperBackup/src/com/android/wallpaperbackup/WallpaperBackupAgent.java b/packages/WallpaperBackup/src/com/android/wallpaperbackup/WallpaperBackupAgent.java
index 8a4a1c6..93bffe9 100644
--- a/packages/WallpaperBackup/src/com/android/wallpaperbackup/WallpaperBackupAgent.java
+++ b/packages/WallpaperBackup/src/com/android/wallpaperbackup/WallpaperBackupAgent.java
@@ -164,6 +164,9 @@
}
if (DEBUG) Slog.v(TAG, "Storing wallpaper metadata");
backupFile(infoStage, data);
+ } else {
+ Slog.w(TAG, "Wallpaper metadata file doesn't exist: " +
+ mWallpaperFile.getPath());
}
if (sysEligible && mWallpaperFile.exists()) {
if (sysChanged || !imageStage.exists()) {
@@ -173,6 +176,10 @@
if (DEBUG) Slog.v(TAG, "Storing system wallpaper image");
backupFile(imageStage, data);
prefs.edit().putInt(SYSTEM_GENERATION, sysGeneration).apply();
+ } else {
+ Slog.w(TAG, "Not backing up wallpaper as one of conditions is not "
+ + "met: sysEligible = " + sysEligible + " wallpaperFileExists = "
+ + mWallpaperFile.exists());
}
// If there's no lock wallpaper, then we have nothing to add to the backup.
@@ -181,7 +188,7 @@
if (DEBUG) Slog.v(TAG, "Removed lock wallpaper; deleting");
lockImageStage.delete();
}
- if (DEBUG) Slog.v(TAG, "No lock paper set, add nothing to backup");
+ Slog.d(TAG, "No lockscreen wallpaper set, add nothing to backup");
prefs.edit().putInt(LOCK_GENERATION, lockGeneration).apply();
return;
}
@@ -195,6 +202,12 @@
if (DEBUG) Slog.v(TAG, "Storing lock wallpaper image");
backupFile(lockImageStage, data);
prefs.edit().putInt(LOCK_GENERATION, lockGeneration).apply();
+ } else {
+ Slog.w(TAG, "Not backing up lockscreen wallpaper as one of conditions is not "
+ + "met: lockEligible = " + lockEligible + " hasLockWallpaper = "
+ + hasLockWallpaper + " lockWallpaperFileExists = "
+ + mLockWallpaperFile.exists() + " quotaExceeded (last time) = "
+ + mQuotaExceeded);
}
} catch (Exception e) {
Slog.e(TAG, "Unable to back up wallpaper", e);
@@ -216,9 +229,7 @@
@Override
public void onQuotaExceeded(long backupDataBytes, long quotaBytes) {
- if (DEBUG) {
- Slog.i(TAG, "Quota exceeded (" + backupDataBytes + " vs " + quotaBytes + ')');
- }
+ Slog.i(TAG, "Quota exceeded (" + backupDataBytes + " vs " + quotaBytes + ')');
try (FileOutputStream f = new FileOutputStream(mQuotaFile)) {
f.write(0);
} catch (Exception e) {
@@ -230,9 +241,7 @@
// then post-process in onRestoreFinished() to apply the new wallpaper.
@Override
public void onRestoreFinished() {
- if (DEBUG) {
- Slog.v(TAG, "onRestoreFinished()");
- }
+ Slog.v(TAG, "onRestoreFinished()");
final File filesDir = getFilesDir();
final File infoStage = new File(filesDir, INFO_STAGE);
final File imageStage = new File (filesDir, IMAGE_STAGE);
@@ -253,9 +262,7 @@
// And reset to the wallpaper service we should be using
ComponentName wpService = parseWallpaperComponent(infoStage, "wp");
if (servicePackageExists(wpService)) {
- if (DEBUG) {
- Slog.i(TAG, "Using wallpaper service " + wpService);
- }
+ Slog.i(TAG, "Using wallpaper service " + wpService);
mWm.setWallpaperComponent(wpService, UserHandle.USER_SYSTEM);
if (!lockImageStage.exists()) {
// We have a live wallpaper and no static lock image,
@@ -273,9 +280,7 @@
} catch (Exception e) {
Slog.e(TAG, "Unable to restore wallpaper: " + e.getMessage());
} finally {
- if (DEBUG) {
- Slog.v(TAG, "Restore finished; clearing backup bookkeeping");
- }
+ Slog.v(TAG, "Restore finished; clearing backup bookkeeping");
infoStage.delete();
imageStage.delete();
lockImageStage.delete();
@@ -295,14 +300,14 @@
// relies on a priori knowledge of the wallpaper info file schema.
Rect cropHint = parseCropHint(info, hintTag);
if (cropHint != null) {
- Slog.i(TAG, "Got restored wallpaper; applying which=" + which);
- if (DEBUG) {
- Slog.v(TAG, "Restored crop hint " + cropHint);
- }
+ Slog.i(TAG, "Got restored wallpaper; applying which=" + which
+ + "; cropHint = " + cropHint);
try (FileInputStream in = new FileInputStream(stage)) {
mWm.setStream(in, cropHint.isEmpty() ? null : cropHint, true, which);
} finally {} // auto-closes 'in'
}
+ } else {
+ Slog.d(TAG, "Restore data doesn't exist for file " + stage.getPath());
}
}