commit 27a7b136661d0e829a06361deb72a4ef41040681
author Dianne Hackborn <hackbod@google.com> Wed Nov 30 10:51:29 2011 -0800
committer Android Git Automerger <android-git-automerger@android.com> Wed Nov 30 10:51:29 2011 -0800
tree b9192e79e6e687594a5bcf9997936e7b81533fc5
parent 4f9787d6f4058a0f6df08456119edd2ae1b546cd
parent 9c83b6ffca5d23257a99c805d8e4540ac80e53c3

am 9c83b6ff: am db904b47: Merge "Fix issue #5628789: Cannot set static/custom wallpaper after clearing Settings data" into ics-mr1

* commit '9c83b6ffca5d23257a99c805d8e4540ac80e53c3':
  Fix issue #5628789: Cannot set static/custom wallpaper after clearing Settings data

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

diff --git a/services/java/com/android/server/WallpaperManagerService.java b/services/java/com/android/server/WallpaperManagerService.java
index 7fa404e..4925a4e 100644
--- a/services/java/com/android/server/WallpaperManagerService.java
+++ b/services/java/com/android/server/WallpaperManagerService.java
@@ -476,6 +476,13 @@
     ParcelFileDescriptor updateWallpaperBitmapLocked(String name) {
         if (name == null) name = "";
         try {
+            if (!WALLPAPER_DIR.exists()) {
+                WALLPAPER_DIR.mkdir();
+                FileUtils.setPermissions(
+                        WALLPAPER_DIR.getPath(),
+                        FileUtils.S_IRWXU|FileUtils.S_IRWXG|FileUtils.S_IXOTH,
+                        -1, -1);
+            }
             ParcelFileDescriptor fd = ParcelFileDescriptor.open(WALLPAPER_FILE,
                     MODE_CREATE|MODE_READ_WRITE);
             mName = name;