am 90c0ae63: Merge "Check which file changed before requesting backup" into lmp-mr1-dev (36ba3e47) · Commits · e / os / android_frameworks_base

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

+10 −6

Original line number	Diff line number	Diff line
		@@ -116,6 +116,7 @@ public class WallpaperManagerService extends IWallpaperManager.Stub {
		final WallpaperData mWallpaper;
		final File mWallpaperDir;
		final File mWallpaperFile;
		final File mWallpaperInfoFile;

		public WallpaperObserver(WallpaperData wallpaper) {
		super(getWallpaperDir(wallpaper.userId).getAbsolutePath(),
		@@ -123,6 +124,7 @@ public class WallpaperManagerService extends IWallpaperManager.Stub {
		mWallpaperDir = getWallpaperDir(wallpaper.userId);
		mWallpaper = wallpaper;
		mWallpaperFile = new File(mWallpaperDir, WALLPAPER);
		mWallpaperInfoFile = new File(mWallpaperDir, WALLPAPER_INFO);
		}

		@Override
		@@ -131,13 +133,15 @@ public class WallpaperManagerService extends IWallpaperManager.Stub {
		return;
		}
		synchronized (mLock) {
		File changedFile = new File(mWallpaperDir, path);
		if (mWallpaperFile.equals(changedFile)
		\|\| mWallpaperInfoFile.equals(changedFile)) {
		// changing the wallpaper means we'll need to back up the new one
		long origId = Binder.clearCallingIdentity();
		BackupManager bm = new BackupManager(mContext);
		bm.dataChanged();
		Binder.restoreCallingIdentity(origId);

		File changedFile = new File(mWallpaperDir, path);
		}
		if (mWallpaperFile.equals(changedFile)) {
		notifyCallbacksLocked(mWallpaper);
		final boolean written = (event == CLOSE_WRITE \|\| event == MOVED_TO);