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

Merge change 6504 into donut

Browse Source 
* changes:
  Don't invoke the transport if doBackup supplied no data
This commit is contained in:
Android (Google) Code Review
2009-07-08 13:54:07 -07:00
parent 91b0a7013e b407f22c9d
commit 1bd3e0fb7e
1 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -810,17 +810,25 @@ class BackupManagerService extends IBackupManager.Stub {
// Now propagate the newly-backed-up data to the transport // Now propagate the newly-backed-up data to the transport
if (success) { if (success) {
if (DEBUG) Log.v(TAG, "doBackup() success; calling transport"); if (DEBUG) Log.v(TAG, "doBackup() success");
if (backupDataName.length() > 0) {
backupData = backupData =
ParcelFileDescriptor.open(backupDataName, ParcelFileDescriptor.MODE_READ_ONLY); ParcelFileDescriptor.open(backupDataName,
ParcelFileDescriptor.MODE_READ_ONLY);
if (!transport.performBackup(packInfo, backupData)) { if (!transport.performBackup(packInfo, backupData)) {
// STOPSHIP TODO: handle errors // STOPSHIP TODO: handle errors
Log.e(TAG, "Backup failure in performBackup()"); Log.e(TAG, "Backup failure in performBackup()");
} }
} else {
if (DEBUG) {
Log.i(TAG, "no backup data written; not calling transport");
}
}
// !!! TODO: After successful transport, delete the now-stale data // After successful transport, delete the now-stale data
// and juggle the files so that next time the new state is passed // and juggle the files so that next time we supply the agent
//backupDataName.delete(); // with the new state file it just created.
backupDataName.delete();
newStateName.renameTo(savedStateName); newStateName.renameTo(savedStateName);
} }
} catch (Exception e) { } catch (Exception e) {