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

am f857b272: am 2e0f6682: Merge "Also monitor MOVED_TO events for wallpaper updates" into lmp-dev

Browse Source 
* commit 'f857b272c27ca6836b5cec51a9f3714603aa2ad0':
  Also monitor MOVED_TO events for wallpaper updates
This commit is contained in:
Christopher Tate
2014-10-09 19:17:23 +00:00
committed by Android Git Automerger
parent 1114b3b8d7 f857b272c2
commit 97cb995e99
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
View File

@@ -116,7 +116,7 @@ public class WallpaperManagerService extends IWallpaperManager.Stub {
public WallpaperObserver(WallpaperData wallpaper) { public WallpaperObserver(WallpaperData wallpaper) {
super(getWallpaperDir(wallpaper.userId).getAbsolutePath(), super(getWallpaperDir(wallpaper.userId).getAbsolutePath(),
CLOSE_WRITE | DELETE | DELETE_SELF); CLOSE_WRITE | MOVED_TO | DELETE | DELETE_SELF);
mWallpaperDir = getWallpaperDir(wallpaper.userId); mWallpaperDir = getWallpaperDir(wallpaper.userId);
mWallpaper = wallpaper; mWallpaper = wallpaper;
mWallpaperFile = new File(mWallpaperDir, WALLPAPER); mWallpaperFile = new File(mWallpaperDir, WALLPAPER);
@@ -137,9 +137,11 @@ public class WallpaperManagerService extends IWallpaperManager.Stub {
File changedFile = new File(mWallpaperDir, path); File changedFile = new File(mWallpaperDir, path);
if (mWallpaperFile.equals(changedFile)) { if (mWallpaperFile.equals(changedFile)) {
notifyCallbacksLocked(mWallpaper); notifyCallbacksLocked(mWallpaper);
if (mWallpaper.wallpaperComponent == null || event != CLOSE_WRITE final boolean written = (event == CLOSE_WRITE || event == MOVED_TO);
if (mWallpaper.wallpaperComponent == null
|| event != CLOSE_WRITE // includes the MOVED_TO case
|| mWallpaper.imageWallpaperPending) { || mWallpaper.imageWallpaperPending) {
if (event == CLOSE_WRITE) { if (written) {
mWallpaper.imageWallpaperPending = false; mWallpaper.imageWallpaperPending = false;
} }
bindWallpaperComponentLocked(mImageWallpaper, true, bindWallpaperComponentLocked(mImageWallpaper, true,