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

am 90d8a6a4: Merge change 25628 into eclair

Browse Source 
Merge commit '90d8a6a449dc12fea2b56b557c243e33746d914a' into eclair-plus-aosp

* commit '90d8a6a449dc12fea2b56b557c243e33746d914a':
  Inefficient but correct fix for 2122381: call finishBackup after every performBackup
This commit is contained in:
Dan Egnor
2009-09-18 15:33:57 -07:00
committed by Android Git Automerger
parent 7714401570 90d8a6a449
commit a63276ed69
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1018,7 +1018,15 @@ class BackupManagerService extends IBackupManager.Stub {
backupData = ParcelFileDescriptor.open(backupDataName,
ParcelFileDescriptor.MODE_READ_ONLY);
if (!transport.performBackup(packInfo, backupData)) throw new Exception();
// TODO - We call finishBackup() for each application backed up, because
// we need to know now whether it succeeded or failed. Instead, we should
// hold off on finishBackup() until the end, which implies holding off on
// renaming *all* the output state files (see below) until that happens.
if (!transport.performBackup(packInfo, backupData) ||
!transport.finishBackup()) {
throw new Exception("Backup transport failed");
}
} else {
if (DEBUG) Log.i(TAG, "no backup data written; not calling transport");
}
@@ -1417,11 +1425,13 @@ class BackupManagerService extends IBackupManager.Stub {
stateFile.delete();
// Tell the transport to remove all the persistent storage for the app
// STOPSHIP TODO - need to handle failures
mTransport.clearBackupData(mPackage);
} catch (RemoteException e) {
// can't happen; the transport is local
} finally {
try {
// STOPSHIP TODO - need to handle failures
mTransport.finishBackup();
} catch (RemoteException e) {
// can't happen; the transport is local