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

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

Browse Source 
Merge commit '5827d3eaf3c53d1dc3ab0d638d935c219a5515a6' into gingerbread

* commit '5827d3eaf3c53d1dc3ab0d638d935c219a5515a6':
  Properly note the current active restore set's token
This commit is contained in:
Dianne Hackborn
2010-06-24 16:01:39 -07:00
committed by Android Git Automerger
parent 01e4cfc47d 5827d3eaf3
commit 5340bffd8b
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 */ }