Merge "Add missing wallpaper service lock." into gingerbread

2010-09-14 11:37:05 -07:00
parent 52e19d5917 194b19a4b3
commit fb85bc66c4
1 changed files with 6 additions and 2 deletions
--- 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() {