diff options
| author | Mathias Agopian <mathias@google.com> | 2009-05-14 22:44:23 -0700 |
|---|---|---|
| committer | Mathias Agopian <mathias@google.com> | 2009-05-14 22:44:23 -0700 |
| commit | 11abc8a36d639775b05a0471c9ea45d83fa19e56 (patch) | |
| tree | edf234f013ef3c88507f81dea65b8187cc672564 /core/java/android/backup/BackupService.java | |
| parent | 6ec72e3fa9cdf9e896f3042fb1b1b4f3f6cea541 (diff) | |
| parent | e52a5a5fca18348728dfc5609b42b88e9cc7ef98 (diff) | |
| download | frameworks_base-11abc8a36d639775b05a0471c9ea45d83fa19e56.zip frameworks_base-11abc8a36d639775b05a0471c9ea45d83fa19e56.tar.gz frameworks_base-11abc8a36d639775b05a0471c9ea45d83fa19e56.tar.bz2 | |
Merge commit 'goog/master' into merge_master
Conflicts:
opengl/libagl/Android.mk
opengl/libs/Android.mk
opengl/libs/egl_impl.h
Diffstat (limited to 'core/java/android/backup/BackupService.java')
| -rw-r--r-- | core/java/android/backup/BackupService.java | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/core/java/android/backup/BackupService.java b/core/java/android/backup/BackupService.java index 6ac703a..50a5921 100644 --- a/core/java/android/backup/BackupService.java +++ b/core/java/android/backup/BackupService.java @@ -75,9 +75,8 @@ public abstract class BackupService extends Service { * file. The application should record the final backup state * here after writing the requested data to dataFd. */ - public abstract void onBackup(ParcelFileDescriptor oldState, - ParcelFileDescriptor data, - ParcelFileDescriptor newState); + public abstract void onBackup(ParcelFileDescriptor oldState, BackupDataOutput data, + ParcelFileDescriptor newState); /** * The application is being restored from backup, and should replace any @@ -92,7 +91,7 @@ public abstract class BackupService extends Service { * file. The application should record the final backup state * here after restoring its data from dataFd. */ - public abstract void onRestore(ParcelFileDescriptor data, ParcelFileDescriptor newState); + public abstract void onRestore(ParcelFileDescriptor /* TODO: BackupDataInput */ data, ParcelFileDescriptor newState); // ----- Core implementation ----- @@ -117,7 +116,15 @@ public abstract class BackupService extends Service { ParcelFileDescriptor newState) throws RemoteException { // !!! TODO - real implementation; for now just invoke the callbacks directly Log.v("BackupServiceBinder", "doBackup() invoked"); - BackupService.this.onBackup(oldState, data, newState); + BackupDataOutput output = new BackupDataOutput(BackupService.this, + data.getFileDescriptor()); + try { + BackupService.this.onBackup(oldState, output, newState); + } catch (RuntimeException ex) { + Log.d("BackupService", "onBackup (" + + BackupService.this.getClass().getName() + ") threw", ex); + throw ex; + } } public void doRestore(ParcelFileDescriptor data, |