diff options
| author | 2011-10-07 13:36:09 -0700 | |
|---|---|---|
| committer | 2011-10-07 13:36:09 -0700 | |
| commit | e47b89cabe38bb0a711c3b2a87be9696c7a1f074 (patch) | |
| tree | f249f6e5400deb338bae72bad367e9b280e87446 | |
| parent | 25d888b5ff23acf1a9d41bef3e74ee897baf5ad7 (diff) | |
| parent | bf6ee4f509cbe7a44f4cc72f28e6150ca47c066d (diff) | |
Merge "Fix wallpaper restore"
| -rw-r--r-- | core/java/android/app/backup/WallpaperBackupHelper.java | 2 | ||||
| -rw-r--r-- | services/java/com/android/server/WallpaperManagerService.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/app/backup/WallpaperBackupHelper.java b/core/java/android/app/backup/WallpaperBackupHelper.java index 0c034cff9d4a..170171e3000a 100644 --- a/core/java/android/app/backup/WallpaperBackupHelper.java +++ b/core/java/android/app/backup/WallpaperBackupHelper.java @@ -35,7 +35,7 @@ import java.io.File; */ public class WallpaperBackupHelper extends FileBackupHelperBase implements BackupHelper { 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 private static final String WALLPAPER_IMAGE = "/data/data/com.android.settings/files/wallpaper"; diff --git a/services/java/com/android/server/WallpaperManagerService.java b/services/java/com/android/server/WallpaperManagerService.java index 253e74159060..a0e28ed47f97 100644 --- a/services/java/com/android/server/WallpaperManagerService.java +++ b/services/java/com/android/server/WallpaperManagerService.java @@ -834,7 +834,7 @@ class WallpaperManagerService extends IWallpaperManager.Stub { } if (DEBUG) Slog.v(TAG, "settingsRestored: success=" + success); if (success) { - bindWallpaperComponentLocked(null, false, false); + bindWallpaperComponentLocked(mNextWallpaperComponent, false, false); } } } |