Merge "Add missing wallpaper service lock." into gingerbread (fb85bc66) · Commits · e / os / android_frameworks_base

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

+6 −2

Original line number	Diff line number	Diff line
		@@ -727,6 +727,7 @@ class WallpaperManagerService extends IWallpaperManager.Stub {
		}
		}

		// Called by SystemBackupAgent after files are restored to disk.
		void settingsRestored() {
		if (DEBUG) Slog.v(TAG, "settingsRestored");

		@@ -766,8 +767,11 @@ class WallpaperManagerService extends IWallpaperManager.Stub {
		mName = "";
		WALLPAPER_FILE.delete();
		}

		synchronized (mLock) {
		saveSettingsLocked();
		}
		}

		boolean restoreNamedResourceLocked() {
		if (mName.length() > 4 && "res:".equals(mName.substring(0, 4))) {