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

Commit 410ea662 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 3471 into donut

* changes:
  Fix contact creation.
parents 996b1c8d e7eb9662
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -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,