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
This commit is contained in:
Dianne Hackborn
2011-11-30 10:51:29 -08:00
committed by Android Git Automerger

View File

@ -476,6 +476,13 @@ class WallpaperManagerService extends IWallpaperManager.Stub {
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;