diff options
author | Fred Quintana <fredq@google.com> | 2009-10-29 13:44:08 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2009-10-29 13:44:08 -0700 |
commit | 0fca5b45ffe86c1c69359e6eb3727a9953b971c9 (patch) | |
tree | 91568bb3e6e70e2c2f4fb2b74993d33e4e8b77ea /core/java | |
parent | 2b770bbe4697ebea040532f308d63478ee4b9454 (diff) | |
parent | 5e5eb393729630800079206498f283de8f02f3a7 (diff) | |
download | frameworks_base-0fca5b45ffe86c1c69359e6eb3727a9953b971c9.zip frameworks_base-0fca5b45ffe86c1c69359e6eb3727a9953b971c9.tar.gz frameworks_base-0fca5b45ffe86c1c69359e6eb3727a9953b971c9.tar.bz2 |
am 5e5eb393: Merge change Id572ffc7 into eclair
Merge commit '5e5eb393729630800079206498f283de8f02f3a7' into eclair-mr2
* commit '5e5eb393729630800079206498f283de8f02f3a7':
don't throw an exception when we can't find a pending sync operation in the database
Diffstat (limited to 'core/java')
-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 */); |