diff options
| author | Fred Quintana <fredq@google.com> | 2009-10-29 14:46:21 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-10-29 14:46:21 -0700 |
| commit | f8c197919aa7dab104eff779c13c8a204d21235b (patch) | |
| tree | 29d411f3053316c9c74762089893c3d0e7157d47 /core | |
| parent | 82e62ef810ebaea23c3405f837b3b49ebd3a82ed (diff) | |
| parent | 29f043d7424a0b1314aa5d5d13fb27ef57aef067 (diff) | |
| download | frameworks_base-f8c197919aa7dab104eff779c13c8a204d21235b.zip frameworks_base-f8c197919aa7dab104eff779c13c8a204d21235b.tar.gz frameworks_base-f8c197919aa7dab104eff779c13c8a204d21235b.tar.bz2 | |
am 29f043d7: am 0fca5b45: am 5e5eb393: Merge change Id572ffc7 into eclair
Merge commit '29f043d7424a0b1314aa5d5d13fb27ef57aef067'
* commit '29f043d7424a0b1314aa5d5d13fb27ef57aef067':
don't throw an exception when we can't find a pending sync operation in the database
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/content/SyncManager.java | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/core/java/android/content/SyncManager.java b/core/java/android/content/SyncManager.java index 8a529e9..1580c66 100644 --- a/core/java/android/content/SyncManager.java +++ b/core/java/android/content/SyncManager.java @@ -2332,8 +2332,8 @@ class SyncManager implements OnAccountsUpdateListener { } if (!mSyncStorageEngine.deleteFromPending(operationToRemove.pendingOperation)) { - throw new IllegalStateException("unable to find pending row for " - + operationToRemove); + final String errorMessage = "unable to find pending row for " + operationToRemove; + Log.e(TAG, errorMessage, new IllegalStateException(errorMessage)); } if (DEBUG_CHECK_DATA_CONSISTENCY) debugCheckDataStructures(true /* check the DB */); @@ -2352,7 +2352,8 @@ class SyncManager implements OnAccountsUpdateListener { } if (!mSyncStorageEngine.deleteFromPending(operation.pendingOperation)) { - throw new IllegalStateException("unable to find pending row for " + operation); + final String errorMessage = "unable to find pending row for " + operation; + Log.e(TAG, errorMessage, new IllegalStateException(errorMessage)); } if (DEBUG_CHECK_DATA_CONSISTENCY) debugCheckDataStructures(true /* check the DB */); @@ -2374,8 +2375,8 @@ class SyncManager implements OnAccountsUpdateListener { } if (!mSyncStorageEngine.deleteFromPending(syncOperation.pendingOperation)) { - throw new IllegalStateException("unable to find pending row for " - + syncOperation); + final String errorMessage = "unable to find pending row for " + syncOperation; + Log.e(TAG, errorMessage, new IllegalStateException(errorMessage)); } if (DEBUG_CHECK_DATA_CONSISTENCY) debugCheckDataStructures(true /* check the DB */); |