drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Dianne Hackborn
2011-11-30 10:20:29 -08:00
committed by Android (Google) Code Review
parent cc084f1d73 ebac48c6ad
commit db904b4782
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/java/com/android/server/WallpaperManagerService.java
View File

@ -476,6 +476,13 @@ class WallpaperManagerService extends IWallpaperManager.Stub {
ParcelFileDescriptor updateWallpaperBitmapLocked(String name) { ParcelFileDescriptor updateWallpaperBitmapLocked(String name) {
if (name == null) name = ""; if (name == null) name = "";
try { 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, ParcelFileDescriptor fd = ParcelFileDescriptor.open(WALLPAPER_FILE,
MODE_CREATE|MODE_READ_WRITE); MODE_CREATE|MODE_READ_WRITE);
mName = name; mName = name;