diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-06-24 16:04:07 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-06-24 16:04:07 -0700 |
| commit | cac3126c6109854640266c4807e5aa8e6a87142f (patch) | |
| tree | 2fad0023faa97e3180cb480de385b4856e702d54 /services | |
| parent | 2eb12a47224f1617787c09824107ac6bc22f9b3e (diff) | |
| parent | 5340bffd8bb2599d15ee79cca3c62d2e7c7ea961 (diff) | |
| download | frameworks_base-cac3126c6109854640266c4807e5aa8e6a87142f.zip frameworks_base-cac3126c6109854640266c4807e5aa8e6a87142f.tar.gz frameworks_base-cac3126c6109854640266c4807e5aa8e6a87142f.tar.bz2 | |
am 5340bffd: am 5827d3ea: Merge "Properly note the current active restore set\'s token" into froyo
Merge commit '5340bffd8bb2599d15ee79cca3c62d2e7c7ea961' into gingerbread-plus-aosp
* commit '5340bffd8bb2599d15ee79cca3c62d2e7c7ea961':
Properly note the current active restore set's token
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/BackupManagerService.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/java/com/android/server/BackupManagerService.java b/services/java/com/android/server/BackupManagerService.java index 49e792c..3db5dc1 100644 --- a/services/java/com/android/server/BackupManagerService.java +++ b/services/java/com/android/server/BackupManagerService.java @@ -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 */ } |