Merge "Properly note the current active restore set's token" into froyo
This commit is contained in:
committed by
Android (Google) Code Review
commit
5827d3eaf3
@ -1313,7 +1313,7 @@ class BackupManagerService extends IBackupManager.Stub {
|
|||||||
// If everything actually went through and this is the first time we've
|
// 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
|
// done a backup, we can now record what the current backup dataset token
|
||||||
// is.
|
// is.
|
||||||
if ((mCurrentToken == 0) && (status != BackupConstants.TRANSPORT_OK)) {
|
if ((mCurrentToken == 0) && (status == BackupConstants.TRANSPORT_OK)) {
|
||||||
try {
|
try {
|
||||||
mCurrentToken = mTransport.getCurrentRestoreSet();
|
mCurrentToken = mTransport.getCurrentRestoreSet();
|
||||||
} catch (RemoteException e) { /* cannot happen */ }
|
} catch (RemoteException e) { /* cannot happen */ }
|
||||||
|
Reference in New Issue
Block a user