diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-06-08 13:28:01 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-06-08 13:28:01 -0700 |
| commit | 410ea66256b4b7883e9e6a3ee50170cf8701e61b (patch) | |
| tree | 7e4e34d16f054d4518ade04a33e1ca946e5e7b76 /core/java | |
| parent | 996b1c8d681268961a9e6518b9a5cbe98ccf0111 (diff) | |
| parent | e7eb9662c3f719d50b0e671c05dae174c7f17802 (diff) | |
| download | frameworks_base-410ea66256b4b7883e9e6a3ee50170cf8701e61b.zip frameworks_base-410ea66256b4b7883e9e6a3ee50170cf8701e61b.tar.gz frameworks_base-410ea66256b4b7883e9e6a3ee50170cf8701e61b.tar.bz2 | |
Merge change 3471 into donut
* changes:
Fix contact creation.
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/content/AbstractTableMerger.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/java/android/content/AbstractTableMerger.java b/core/java/android/content/AbstractTableMerger.java index 94afcee..9c760d9 100644 --- a/core/java/android/content/AbstractTableMerger.java +++ b/core/java/android/content/AbstractTableMerger.java @@ -61,10 +61,10 @@ public abstract class AbstractTableMerger _SYNC_ID +"=? and " + _SYNC_ACCOUNT + "=?"; private static final String SELECT_BY_ID = BaseColumns._ID +"=?"; - // The last clause rejects events with a null _SYNC_VERSION if they've already been synced - private static final String SELECT_UNSYNCED = "" - + _SYNC_DIRTY + " > 0 and (" + _SYNC_ACCOUNT + "=? or " + _SYNC_ACCOUNT + " is null) " - + "and (" + _SYNC_VERSION + " is not null or " + _SYNC_ACCOUNT + " is null)"; + private static final String SELECT_UNSYNCED = + "(" + _SYNC_ACCOUNT + " IS NULL OR " + _SYNC_ACCOUNT + "=?) AND " + + "(" + _SYNC_ID + " IS NULL OR (" + _SYNC_DIRTY + " > 0 AND " + + _SYNC_VERSION + " IS NOT NULL))"; public AbstractTableMerger(SQLiteDatabase database, String table, Uri tableURL, String deletedTable, |