From a0c39e28e56d642168ad18dccb86f5787b4e1592 Mon Sep 17 00:00:00 2001 From: Christopher Tate Date: Thu, 6 Oct 2011 17:24:54 -0700 Subject: [PATCH] DO NOT MERGE: fix wallpaper restore Following a restore of the wallpaper data files, the settingsRestored() method was binding the new wallpaper by passing null as the component, because once upon a time that meant just use the configuration that had just been loaded from the [newly restored] settings filed. However, at some point this broke when the load from settings was made a staging operation, not also the commitment of the changes. This CL passes the newly-determined component configuration explicitly to the bind, overriding the product default that may already have been emplaced by the time the restore happens. Will not merge cleanly downstream; the parallel (small) change will be made explicitly there. Bug 5416839 Change-Id: I50b5d57fafd176529ac7a90cac8116bbc9f696fd --- services/java/com/android/server/WallpaperManagerService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/java/com/android/server/WallpaperManagerService.java b/services/java/com/android/server/WallpaperManagerService.java index 6ceccafdbd6ae..c7c05d532a2d6 100644 --- a/services/java/com/android/server/WallpaperManagerService.java +++ b/services/java/com/android/server/WallpaperManagerService.java @@ -786,7 +786,7 @@ class WallpaperManagerService extends IWallpaperManager.Stub { } if (DEBUG) Slog.v(TAG, "settingsRestored: success=" + success); if (success) { - bindWallpaperComponentLocked(null, false); + bindWallpaperComponentLocked(mNextWallpaperComponent, false); } } }