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

Commit 5827d3ea authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "Properly note the current active restore set's token" into froyo

parents d19c397b 2950555a

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 */ }