Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Put some useful information in User-Agent Header"

Browse Source
This commit is contained in:
Alon Albert
2013-01-07 09:18:51 -08:00
committed by Android (Google) Code Review
parent 0ada5d656d 8ac6a63a94
commit 35d67ec31a
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -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 CAN_PARTIALLY_UPDATE = "canPartiallyUpdate";
field public static final java.lang.String DELETED = "deleted"; 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 DIRTY = "dirty";
field public static final java.lang.String MUTATORS = "mutators";
field public static final java.lang.String _SYNC_ID = "_sync_id"; field public static final java.lang.String _SYNC_ID = "_sync_id";
} }

13
core/java/android/provider/CalendarContract.java
View File

@@ -302,8 +302,15 @@ public final class CalendarContract {
* Used to indicate that local, unsynced, changes are present. * Used to indicate that local, unsynced, changes are present.
* <P>Type: INTEGER (long)</P> * <P>Type: INTEGER (long)</P>
*/ */
public static final String DIRTY = "dirty"; public static final String DIRTY = "dirty";
/**
* Used in conjunction with {@link #DIRTY} to indicate what packages wrote local changes.
* <P>Type: TEXT</P>
*/
public static final String MUTATORS = "mutators";
/** /**
* Whether the row has been deleted but not synced to the server. A * Whether the row has been deleted but not synced to the server. A
* deleted row should be ignored. * deleted row should be ignored.
@@ -525,6 +532,7 @@ public final class CalendarContract {
DatabaseUtils.cursorStringToContentValuesIfPresent(cursor, cv, _SYNC_ID); DatabaseUtils.cursorStringToContentValuesIfPresent(cursor, cv, _SYNC_ID);
DatabaseUtils.cursorLongToContentValuesIfPresent(cursor, cv, DIRTY); DatabaseUtils.cursorLongToContentValuesIfPresent(cursor, cv, DIRTY);
DatabaseUtils.cursorStringToContentValuesIfPresent(cursor, cv, MUTATORS);
DatabaseUtils.cursorStringToContentValuesIfPresent(cursor, cv, CAL_SYNC1); DatabaseUtils.cursorStringToContentValuesIfPresent(cursor, cv, CAL_SYNC1);
DatabaseUtils.cursorStringToContentValuesIfPresent(cursor, cv, CAL_SYNC2); DatabaseUtils.cursorStringToContentValuesIfPresent(cursor, cv, CAL_SYNC2);
@@ -647,6 +655,7 @@ public final class CalendarContract {
* <li>{@link #CALENDAR_COLOR}</li> * <li>{@link #CALENDAR_COLOR}</li>
* <li>{@link #_SYNC_ID}</li> * <li>{@link #_SYNC_ID}</li>
* <li>{@link #DIRTY}</li> * <li>{@link #DIRTY}</li>
* <li>{@link #MUTATORS}</li>
* <li>{@link #OWNER_ACCOUNT}</li> * <li>{@link #OWNER_ACCOUNT}</li>
* <li>{@link #MAX_REMINDERS}</li> * <li>{@link #MAX_REMINDERS}</li>
* <li>{@link #ALLOWED_REMINDERS}</li> * <li>{@link #ALLOWED_REMINDERS}</li>
@@ -714,6 +723,7 @@ public final class CalendarContract {
ACCOUNT_TYPE, ACCOUNT_TYPE,
_SYNC_ID, _SYNC_ID,
DIRTY, DIRTY,
MUTATORS,
OWNER_ACCOUNT, OWNER_ACCOUNT,
MAX_REMINDERS, MAX_REMINDERS,
ALLOWED_REMINDERS, ALLOWED_REMINDERS,
@@ -1393,6 +1403,7 @@ public final class CalendarContract {
DatabaseUtils.cursorStringToContentValuesIfPresent(cursor, cv, IS_ORGANIZER); DatabaseUtils.cursorStringToContentValuesIfPresent(cursor, cv, IS_ORGANIZER);
DatabaseUtils.cursorStringToContentValuesIfPresent(cursor, cv, _SYNC_ID); DatabaseUtils.cursorStringToContentValuesIfPresent(cursor, cv, _SYNC_ID);
DatabaseUtils.cursorLongToContentValuesIfPresent(cursor, cv, DIRTY); DatabaseUtils.cursorLongToContentValuesIfPresent(cursor, cv, DIRTY);
DatabaseUtils.cursorStringToContentValuesIfPresent(cursor, cv, MUTATORS);
DatabaseUtils.cursorLongToContentValuesIfPresent(cursor, cv, LAST_SYNCED); DatabaseUtils.cursorLongToContentValuesIfPresent(cursor, cv, LAST_SYNCED);
DatabaseUtils.cursorIntToContentValuesIfPresent(cursor, cv, DELETED); DatabaseUtils.cursorIntToContentValuesIfPresent(cursor, cv, DELETED);
DatabaseUtils.cursorStringToContentValuesIfPresent(cursor, cv, SYNC_DATA1); 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 * The following Events columns are writable only by a sync adapter
* <ul> * <ul>
* <li>{@link #DIRTY}</li> * <li>{@link #DIRTY}</li>
* <li>{@link #MUTATORS}</li>
* <li>{@link #_SYNC_ID}</li> * <li>{@link #_SYNC_ID}</li>
* <li>{@link #SYNC_DATA1}</li> * <li>{@link #SYNC_DATA1}</li>
* <li>{@link #SYNC_DATA2}</li> * <li>{@link #SYNC_DATA2}</li>
@@ -1688,6 +1700,7 @@ public final class CalendarContract {
public static final String[] SYNC_WRITABLE_COLUMNS = new String[] { public static final String[] SYNC_WRITABLE_COLUMNS = new String[] {
_SYNC_ID, _SYNC_ID,
DIRTY, DIRTY,
MUTATORS,
SYNC_DATA1, SYNC_DATA1,
SYNC_DATA2, SYNC_DATA2,
SYNC_DATA3, SYNC_DATA3,