am 0fca5b45: am 5e5eb393: Merge change Id572ffc7 into eclair

Merge commit '0fca5b45ffe86c1c69359e6eb3727a9953b971c9' into eclair-mr2-plus-aosp

* commit '0fca5b45ffe86c1c69359e6eb3727a9953b971c9':
  don't throw an exception when we can't find a pending sync operation in the database

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 */);