Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5340bffd authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

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

Merge commit '5827d3ea' into gingerbread

* commit '5827d3ea':
  Properly note the current active restore set's token
parents 01e4cfc4 5827d3ea

services/java/com/android/server/BackupManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -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 */ }