diff --git a/api/current.txt b/api/current.txt index 111bd655e672e..e4d5fd1f188c1 100644 --- a/api/current.txt +++ b/api/current.txt @@ -17360,6 +17360,7 @@ package android.provider { field public static final java.lang.String CAN_PARTIALLY_UPDATE = "canPartiallyUpdate"; field public static final java.lang.String DELETED = "deleted"; field public static final java.lang.String DIRTY = "dirty"; + field public static final java.lang.String MUTATORS = "mutators"; field public static final java.lang.String _SYNC_ID = "_sync_id"; } diff --git a/core/java/android/provider/CalendarContract.java b/core/java/android/provider/CalendarContract.java index af6e88e99bcab..5fdca86c8d8af 100644 --- a/core/java/android/provider/CalendarContract.java +++ b/core/java/android/provider/CalendarContract.java @@ -302,8 +302,15 @@ public final class CalendarContract { * Used to indicate that local, unsynced, changes are present. *

Type: INTEGER (long)

*/ + public static final String DIRTY = "dirty"; + /** + * Used in conjunction with {@link #DIRTY} to indicate what packages wrote local changes. + *

Type: TEXT

+ */ + public static final String MUTATORS = "mutators"; + /** * Whether the row has been deleted but not synced to the server. A * deleted row should be ignored. @@ -525,6 +532,7 @@ public final class CalendarContract { DatabaseUtils.cursorStringToContentValuesIfPresent(cursor, cv, _SYNC_ID); DatabaseUtils.cursorLongToContentValuesIfPresent(cursor, cv, DIRTY); + DatabaseUtils.cursorStringToContentValuesIfPresent(cursor, cv, MUTATORS); DatabaseUtils.cursorStringToContentValuesIfPresent(cursor, cv, CAL_SYNC1); DatabaseUtils.cursorStringToContentValuesIfPresent(cursor, cv, CAL_SYNC2); @@ -647,6 +655,7 @@ public final class CalendarContract { *
  • {@link #CALENDAR_COLOR}
  • *
  • {@link #_SYNC_ID}
  • *
  • {@link #DIRTY}
  • + *
  • {@link #MUTATORS}
  • *
  • {@link #OWNER_ACCOUNT}
  • *
  • {@link #MAX_REMINDERS}
  • *
  • {@link #ALLOWED_REMINDERS}
  • @@ -714,6 +723,7 @@ public final class CalendarContract { ACCOUNT_TYPE, _SYNC_ID, DIRTY, + MUTATORS, OWNER_ACCOUNT, MAX_REMINDERS, ALLOWED_REMINDERS, @@ -1393,6 +1403,7 @@ public final class CalendarContract { DatabaseUtils.cursorStringToContentValuesIfPresent(cursor, cv, IS_ORGANIZER); DatabaseUtils.cursorStringToContentValuesIfPresent(cursor, cv, _SYNC_ID); DatabaseUtils.cursorLongToContentValuesIfPresent(cursor, cv, DIRTY); + DatabaseUtils.cursorStringToContentValuesIfPresent(cursor, cv, MUTATORS); DatabaseUtils.cursorLongToContentValuesIfPresent(cursor, cv, LAST_SYNCED); DatabaseUtils.cursorIntToContentValuesIfPresent(cursor, cv, DELETED); DatabaseUtils.cursorStringToContentValuesIfPresent(cursor, cv, SYNC_DATA1); @@ -1599,6 +1610,7 @@ public final class CalendarContract { * The following Events columns are writable only by a sync adapter *