From 194b19a4b3ff877d2720ed35e607e329fcfa8186 Mon Sep 17 00:00:00 2001
From: Brad Fitzpatrick <bradfitz@android.com>
Date: Tue, 14 Sep 2010 11:30:29 -0700
Subject: [PATCH] Add missing wallpaper service lock.

Unimportant, but found while reading the code for other reasons.

Change-Id: I9f2fad3ff5d081aef7a35e5f33ec5de7dc92195e
---
 .../java/com/android/server/WallpaperManagerService.java  | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/services/java/com/android/server/WallpaperManagerService.java b/services/java/com/android/server/WallpaperManagerService.java
index 124da4ee730f2..c837a3ae0555f 100644
--- a/services/java/com/android/server/WallpaperManagerService.java
+++ b/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() {