diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-10-28 18:05:09 -0400 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-10-28 18:05:09 -0400 |
| commit | 5e5eb393729630800079206498f283de8f02f3a7 (patch) | |
| tree | 4f00b71d40e6f7454722d84ba198200683e5c7bb /core/java | |
| parent | 85ade33edcc7d9be462ad7b8455d27f6654aca5e (diff) | |
| parent | cb41faa285ad0c00bcdc8815d4bf83219552007d (diff) | |
| download | frameworks_base-5e5eb393729630800079206498f283de8f02f3a7.zip frameworks_base-5e5eb393729630800079206498f283de8f02f3a7.tar.gz frameworks_base-5e5eb393729630800079206498f283de8f02f3a7.tar.bz2 | |
Merge change Id572ffc7 into eclair
* changes:
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 9757ef6..ba18615 100644 --- a/core/java/android/content/SyncManager.java +++ b/core/java/android/content/SyncManager.java @@ -2294,8 +2294,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 */); @@ -2314,7 +2314,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 */); @@ -2336,8 +2337,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 */); |