diff options
| author | Marc Blank <mblank@google.com> | 2010-04-29 15:39:37 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-04-29 15:39:37 -0700 |
| commit | 794cd640bfa8c6d82803b59bc18cbd73627a8162 (patch) | |
| tree | c33d79303167b95fadd24da7a57c30d3b16bcf0c /core/java/android | |
| parent | 77a1beb137948ad45423bb8fcd7e424e36144133 (diff) | |
| parent | 8f643c1040d45f03584b0382c7c5d933388b9103 (diff) | |
Merge "Expose _id in ExtendedProperties subValues" into froyo
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/provider/Calendar.java | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/core/java/android/provider/Calendar.java b/core/java/android/provider/Calendar.java index ba63a6657072..9a0980528e4b 100644 --- a/core/java/android/provider/Calendar.java +++ b/core/java/android/provider/Calendar.java @@ -638,11 +638,13 @@ public final class Calendar { private static final int COLUMN_ATTENDEE_TYPE = 3; private static final int COLUMN_ATTENDEE_STATUS = 4; private static final String[] EXTENDED_PROJECTION = new String[] { + ExtendedProperties._ID, ExtendedProperties.NAME, - ExtendedProperties.VALUE, + ExtendedProperties.VALUE }; - private static final int COLUMN_NAME = 0; - private static final int COLUMN_VALUE = 1; + private static final int COLUMN_ID = 0; + private static final int COLUMN_NAME = 1; + private static final int COLUMN_VALUE = 2; private static final String WHERE_EVENT_ID = "event_id=?"; @@ -772,6 +774,8 @@ public final class Calendar { try { while (subCursor.moveToNext()) { ContentValues extendedValues = new ContentValues(); + extendedValues.put(ExtendedProperties._ID, + subCursor.getString(COLUMN_ID)); extendedValues.put(ExtendedProperties.NAME, subCursor.getString(COLUMN_NAME)); extendedValues.put(ExtendedProperties.VALUE, |