Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0fca5b45 authored by Fred Quintana's avatar Fred Quintana Committed by Android Git Automerger
Browse files

am 5e5eb393: Merge change Id572ffc7 into eclair 

Merge commit '5e5eb393' into eclair-mr2

* commit '5e5eb393':
  don't throw an exception when we can't find a pending sync operation in the database
parents 2b770bbe 5e5eb393

core/java/android/content/SyncManager.java

+6 −5
Original line number Diff line number Diff line
@@ -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 */);