Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix issue #5342788: Setting wallpaper from gallery set default..." into ics-mr0

Browse Source
This commit is contained in:
Dianne Hackborn
2011-10-21 12:45:07 -07:00
committed by Android (Google) Code Review
parent f1ed59bceb 3da318202f
commit 943da7b895
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -102,7 +102,7 @@ class WallpaperManagerService extends IWallpaperManager.Stub {
* everytime the wallpaper is changed.
*/
private final FileObserver mWallpaperObserver = new FileObserver(
WALLPAPER_DIR.getAbsolutePath(), CREATE | CLOSE_WRITE | DELETE | DELETE_SELF) {
WALLPAPER_DIR.getAbsolutePath(), CLOSE_WRITE | DELETE | DELETE_SELF) {
@Override
public void onEvent(int event, String path) {
if (path == null) {
@@ -118,8 +118,11 @@ class WallpaperManagerService extends IWallpaperManager.Stub {
File changedFile = new File(WALLPAPER_DIR, path);
if (WALLPAPER_FILE.equals(changedFile)) {
notifyCallbacksLocked();
if (mWallpaperComponent == null || mImageWallpaperPending) {
mImageWallpaperPending = false;
if (mWallpaperComponent == null || event != CLOSE_WRITE
|| mImageWallpaperPending) {
if (event == CLOSE_WRITE) {
mImageWallpaperPending = false;
}
bindWallpaperComponentLocked(mImageWallpaperComponent,
true, false);
saveSettingsLocked();