am 79cc46d1: am fb85bc66: Merge "Add missing wallpaper service lock." into gingerbread

Merge commit '79cc46d1b039fe6e16aa84b5f1e460afea52e672'

* commit '79cc46d1b039fe6e16aa84b5f1e460afea52e672':
  Add missing wallpaper service lock.

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

@@ -727,9 +727,10 @@ class WallpaperManagerService extends IWallpaperManager.Stub {
         }
     }
 
+    // Called by SystemBackupAgent after files are restored to disk.
     void settingsRestored() {
         if (DEBUG) Slog.v(TAG, "settingsRestored");
-        
+
         boolean success = false;
         synchronized (mLock) {
             loadSettingsLocked();
@@ -766,7 +767,10 @@ class WallpaperManagerService extends IWallpaperManager.Stub {
             mName = "";
             WALLPAPER_FILE.delete();
         }
-        saveSettingsLocked();
+
+        synchronized (mLock) {
+            saveSettingsLocked();
+        }
     }
 
     boolean restoreNamedResourceLocked() {