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

Merge "Check which file changed before requesting backup" into lmp-mr1-dev

Browse Source
This commit is contained in:
Christopher Tate
2014-12-13 00:52:08 +00:00
committed by Android (Google) Code Review
parent a6bfe6c957 52d750c5c2
commit 90c0ae637a
1 changed files with 10 additions and 6 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,6 +116,7 @@ public class WallpaperManagerService extends IWallpaperManager.Stub {
final WallpaperData mWallpaper; final WallpaperData mWallpaper;
final File mWallpaperDir; final File mWallpaperDir;
final File mWallpaperFile; final File mWallpaperFile;
final File mWallpaperInfoFile;
public WallpaperObserver(WallpaperData wallpaper) { public WallpaperObserver(WallpaperData wallpaper) {
super(getWallpaperDir(wallpaper.userId).getAbsolutePath(), super(getWallpaperDir(wallpaper.userId).getAbsolutePath(),
@@ -123,6 +124,7 @@ public class WallpaperManagerService extends IWallpaperManager.Stub {
mWallpaperDir = getWallpaperDir(wallpaper.userId); mWallpaperDir = getWallpaperDir(wallpaper.userId);
mWallpaper = wallpaper; mWallpaper = wallpaper;
mWallpaperFile = new File(mWallpaperDir, WALLPAPER); mWallpaperFile = new File(mWallpaperDir, WALLPAPER);
mWallpaperInfoFile = new File(mWallpaperDir, WALLPAPER_INFO);
} }
@Override @Override
@@ -131,13 +133,15 @@ public class WallpaperManagerService extends IWallpaperManager.Stub {
return; return;
} }
synchronized (mLock) { 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 // changing the wallpaper means we'll need to back up the new one
long origId = Binder.clearCallingIdentity(); long origId = Binder.clearCallingIdentity();
BackupManager bm = new BackupManager(mContext); BackupManager bm = new BackupManager(mContext);
bm.dataChanged(); bm.dataChanged();
Binder.restoreCallingIdentity(origId); Binder.restoreCallingIdentity(origId);
}
File changedFile = new File(mWallpaperDir, path);
if (mWallpaperFile.equals(changedFile)) { if (mWallpaperFile.equals(changedFile)) {
notifyCallbacksLocked(mWallpaper); notifyCallbacksLocked(mWallpaper);
final boolean written = (event == CLOSE_WRITE || event == MOVED_TO); final boolean written = (event == CLOSE_WRITE || event == MOVED_TO);