commit e47b89cabe38bb0a711c3b2a87be9696c7a1f074
author Christopher Tate <ctate@google.com> Fri Oct 07 13:36:09 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Oct 07 13:36:09 2011 -0700
tree f249f6e5400deb338bae72bad367e9b280e87446
parent 25d888b5ff23acf1a9d41bef3e74ee897baf5ad7
parent bf6ee4f509cbe7a44f4cc72f28e6150ca47c066d

Merge "Fix wallpaper restore"

core/java/android/app/backup/WallpaperBackupHelper.java

diff --git a/core/java/android/app/backup/WallpaperBackupHelper.java b/core/java/android/app/backup/WallpaperBackupHelper.java
index 0c034cf..170171e 100644
--- a/core/java/android/app/backup/WallpaperBackupHelper.java
+++ b/core/java/android/app/backup/WallpaperBackupHelper.java
@@ -35,7 +35,7 @@
  */
 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";

services/java/com/android/server/WallpaperManagerService.java

diff --git a/services/java/com/android/server/WallpaperManagerService.java b/services/java/com/android/server/WallpaperManagerService.java
index 253e741..a0e28ed 100644
--- a/services/java/com/android/server/WallpaperManagerService.java
+++ b/services/java/com/android/server/WallpaperManagerService.java
@@ -834,7 +834,7 @@
                 }
                 if (DEBUG) Slog.v(TAG, "settingsRestored: success=" + success);
                 if (success) {
-                    bindWallpaperComponentLocked(null, false, false);
+                    bindWallpaperComponentLocked(mNextWallpaperComponent, false, false);
                 }
             }
         }