From 36800d4450233d7729879717be89ce2c6e8effb3 Mon Sep 17 00:00:00 2001 From: Ken Shirriff Date: Mon, 15 Jun 2009 15:24:09 -0700 Subject: [PATCH] Fix AbstractTableMerger for new Account format. eclair has a _SYNC_ACCOUNT_TYPE field that isn't in donut, so SELECT_UNSYNC needs to be updated with that field. The lack of it causes a SQLiteException. bug=1906760 --- core/java/android/content/AbstractTableMerger.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/core/java/android/content/AbstractTableMerger.java b/core/java/android/content/AbstractTableMerger.java index 6c7b7fe0b42cd..3266c07a7ff39 100644 --- a/core/java/android/content/AbstractTableMerger.java +++ b/core/java/android/content/AbstractTableMerger.java @@ -64,8 +64,9 @@ public abstract class AbstractTableMerger private static final String SELECT_BY_ID = BaseColumns._ID +"=?"; private static final String SELECT_UNSYNCED = - "(" + _SYNC_ACCOUNT + " IS NULL OR " + _SYNC_ACCOUNT + "=?) AND " - + "(" + _SYNC_ID + " IS NULL OR (" + _SYNC_DIRTY + " > 0 AND " + "(" + _SYNC_ACCOUNT + " IS NULL OR (" + + _SYNC_ACCOUNT + "=? and " + _SYNC_ACCOUNT_TYPE + "=?)) and " + + "(" + _SYNC_ID + " IS NULL OR (" + _SYNC_DIRTY + " > 0 and " + _SYNC_VERSION + " IS NOT NULL))"; public AbstractTableMerger(SQLiteDatabase database,