Skip to content

Commit a0c39e2

Browse files
author
Christopher Tate
committed
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
1 parent 65162b1 commit a0c39e2

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -786,7 +786,7 @@ void settingsRestored() {
786786
}
787787
if (DEBUG) Slog.v(TAG, "settingsRestored: success=" + success);
788788
if (success) {
789-
bindWallpaperComponentLocked(null, false);
789+
bindWallpaperComponentLocked(mNextWallpaperComponent, false);
790790
}
791791
}
792792
}

0 commit comments

Comments
 (0)