diff options
author | Marc Blank <mblank@google.com> | 2010-02-25 16:59:54 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-02-25 16:59:54 -0800 |
commit | 50d89f961630e2d972013f20b8001d0aa0adedf4 (patch) | |
tree | 0c3b82ae1643f8913a4b572cbc66a50f07a99091 /core/java | |
parent | 1fc2ff97eda4fc58088f1272600450374c6ad336 (diff) | |
parent | 64a556d755d27b1182897e9243cf4f3016e76a88 (diff) | |
download | frameworks_base-50d89f961630e2d972013f20b8001d0aa0adedf4.zip frameworks_base-50d89f961630e2d972013f20b8001d0aa0adedf4.tar.gz frameworks_base-50d89f961630e2d972013f20b8001d0aa0adedf4.tar.bz2 |
Merge "Define the new lastSyncedAttendeeStatus column"
Diffstat (limited to 'core/java')
-rw-r--r-- | core/java/android/provider/Calendar.java | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/core/java/android/provider/Calendar.java b/core/java/android/provider/Calendar.java index cb42d73..c9dab60 100644 --- a/core/java/android/provider/Calendar.java +++ b/core/java/android/provider/Calendar.java @@ -19,15 +19,15 @@ package android.provider; import android.accounts.Account; import android.app.AlarmManager; import android.app.PendingIntent; +import android.content.ContentProviderClient; import android.content.ContentResolver; import android.content.ContentUris; import android.content.ContentValues; import android.content.Context; -import android.content.Intent; -import android.content.EntityIterator; import android.content.CursorEntityIterator; import android.content.Entity; -import android.content.ContentProviderClient; +import android.content.EntityIterator; +import android.content.Intent; import android.database.Cursor; import android.database.DatabaseUtils; import android.net.Uri; @@ -408,6 +408,12 @@ public final class Calendar { public static final String SELF_ATTENDEE_STATUS = "selfAttendeeStatus"; /** + * This column is available for use by sync adapters + * <P>Type: TEXT</P> + */ + public static final String SYNC_ADAPTER_DATA = "syncAdapterData"; + + /** * The comments feed uri. * <P>Type: TEXT</P> */ @@ -644,6 +650,7 @@ public final class Calendar { mProvider = provider; } + @Override public Entity getEntityAndIncrementCursor(Cursor cursor) throws RemoteException { // we expect the cursor is already at the row we need to read from final long eventId = cursor.getLong(cursor.getColumnIndexOrThrow(Events._ID)); |