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

am 5340bffd: am 5827d3ea: Merge "Properly note the current active restore set\'s token" into froyo

Browse Source 
Merge commit '5340bffd8bb2599d15ee79cca3c62d2e7c7ea961' into gingerbread-plus-aosp

* commit '5340bffd8bb2599d15ee79cca3c62d2e7c7ea961':
  Properly note the current active restore set's token
This commit is contained in:
Dianne Hackborn
2010-06-24 16:04:07 -07:00
committed by Android Git Automerger
parent 2eb12a4722 5340bffd8b
commit cac3126c61
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1313,7 +1313,7 @@ class BackupManagerService extends IBackupManager.Stub {
// If everything actually went through and this is the first time we've
// done a backup, we can now record what the current backup dataset token
// is.
if ((mCurrentToken == 0) && (status != BackupConstants.TRANSPORT_OK)) {
if ((mCurrentToken == 0) && (status == BackupConstants.TRANSPORT_OK)) {
try {
mCurrentToken = mTransport.getCurrentRestoreSet();
} catch (RemoteException e) { /* cannot happen */ }