drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change I5ae73af7 into eclair

Browse Source 
* changes:
  Don't back up system wallpapers.
This commit is contained in:
Android (Google) Code Review
2009-11-12 09:52:10 -08:00
parent 3c58d279ab 541fa51e5c
commit ddf157cae4
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/java/com/android/server/SystemBackupAgent.java
View File

@ -45,8 +45,16 @@ public class SystemBackupAgent extends BackupHelperAgent {
public void onBackup(ParcelFileDescriptor oldState, BackupDataOutput data, public void onBackup(ParcelFileDescriptor oldState, BackupDataOutput data,
ParcelFileDescriptor newState) throws IOException { ParcelFileDescriptor newState) throws IOException {
// We only back up the data under the current "wallpaper" schema with metadata // We only back up the data under the current "wallpaper" schema with metadata
addHelper("wallpaper", new AbsoluteFileBackupHelper(SystemBackupAgent.this, WallpaperManagerService wallpaper = (WallpaperManagerService)ServiceManager.getService(
new String[] { WALLPAPER_IMAGE, WALLPAPER_INFO })); Context.WALLPAPER_SERVICE);
String[] files = new String[] { WALLPAPER_IMAGE, WALLPAPER_INFO };
if (wallpaper != null && wallpaper.mName != null && wallpaper.mName.length() > 0) {
// When the wallpaper has a name, back up the info by itself.
// TODO: Don't rely on the innards of the service object like this!
// TODO: Send a delete for any stored wallpaper image in this case?
files = new String[] { WALLPAPER_INFO };
}
addHelper("wallpaper", new AbsoluteFileBackupHelper(SystemBackupAgent.this, files));
super.onBackup(oldState, data, newState); super.onBackup(oldState, data, newState);
} }