Merge "Fix wallpaper restore"

This commit is contained in:
Christopher Tate
2011-10-07 13:36:09 -07:00
committed by Android (Google) Code Review
2 changed files with 2 additions and 2 deletions

View File

@@ -35,7 +35,7 @@ import java.io.File;
*/ */
public class WallpaperBackupHelper extends FileBackupHelperBase implements BackupHelper { public class WallpaperBackupHelper extends FileBackupHelperBase implements BackupHelper {
private static final String TAG = "WallpaperBackupHelper"; private static final String TAG = "WallpaperBackupHelper";
private static final boolean DEBUG = true; private static final boolean DEBUG = false;
// This path must match what the WallpaperManagerService uses // This path must match what the WallpaperManagerService uses
private static final String WALLPAPER_IMAGE = "/data/data/com.android.settings/files/wallpaper"; private static final String WALLPAPER_IMAGE = "/data/data/com.android.settings/files/wallpaper";

View File

@@ -834,7 +834,7 @@ class WallpaperManagerService extends IWallpaperManager.Stub {
} }
if (DEBUG) Slog.v(TAG, "settingsRestored: success=" + success); if (DEBUG) Slog.v(TAG, "settingsRestored: success=" + success);
if (success) { if (success) {
bindWallpaperComponentLocked(null, false, false); bindWallpaperComponentLocked(mNextWallpaperComponent, false, false);
} }
} }
} }