From f013e1afd1e68af5e3b868c26a653bbfb39538f8 Mon Sep 17 00:00:00 2001
From: The Android Open Source Project <initial-contribution@android.com>
Date: Wed, 17 Dec 2008 18:05:43 -0800
Subject: Code drop from //branches/cupcake/...@124589

---
 core/java/android/content/AbstractTableMerger.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'core/java/android/content/AbstractTableMerger.java')

diff --git a/core/java/android/content/AbstractTableMerger.java b/core/java/android/content/AbstractTableMerger.java
index 56e5d4a..e1a484e 100644
--- a/core/java/android/content/AbstractTableMerger.java
+++ b/core/java/android/content/AbstractTableMerger.java
@@ -548,7 +548,8 @@ public abstract class AbstractTableMerger
         long numDeletedEntries = 0;
         if (mDeletedTable != null) {
             Cursor deletedCursor = mDb.query(mDeletedTable,
-                    syncIdAndVersionProjection, _SYNC_ACCOUNT + "=?", accountSelectionArgs,
+                    syncIdAndVersionProjection,
+                    _SYNC_ACCOUNT + "=? AND " + _SYNC_ID + " IS NOT NULL", accountSelectionArgs,
                     null, null, mDeletedTable + "." + _SYNC_ID);
 
             numDeletedEntries = deletedCursor.getCount();
-- 
cgit v1.1