Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f857b272 authored by Christopher Tate's avatar Christopher Tate Committed by Android Git Automerger
Browse files

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

* commit '2e0f6682':
  Also monitor MOVED_TO events for wallpaper updates
parents 708206c3 2e0f6682

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

+5 −3
Original line number Original line Diff line number Diff line
@@ -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,