drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Expose _id in ExtendedProperties subValues" into froyo

Browse Source
This commit is contained in:
Marc Blank
2010-04-29 15:39:37 -07:00
committed by Android (Google) Code Review
parent 77a1beb137 8f643c1040
commit 794cd640bf
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/provider/Calendar.java
View File

@ -638,11 +638,13 @@ public final class Calendar {
private static final int COLUMN_ATTENDEE_TYPE = 3; private static final int COLUMN_ATTENDEE_TYPE = 3;
private static final int COLUMN_ATTENDEE_STATUS = 4; private static final int COLUMN_ATTENDEE_STATUS = 4;
private static final String[] EXTENDED_PROJECTION = new String[] { private static final String[] EXTENDED_PROJECTION = new String[] {
ExtendedProperties._ID,
ExtendedProperties.NAME, ExtendedProperties.NAME,
ExtendedProperties.VALUE, ExtendedProperties.VALUE
}; };
private static final int COLUMN_NAME = 0; private static final int COLUMN_ID = 0;
private static final int COLUMN_VALUE = 1; private static final int COLUMN_NAME = 1;
private static final int COLUMN_VALUE = 2;
private static final String WHERE_EVENT_ID = "event_id=?"; private static final String WHERE_EVENT_ID = "event_id=?";
@ -772,6 +774,8 @@ public final class Calendar {
try { try {
while (subCursor.moveToNext()) { while (subCursor.moveToNext()) {
ContentValues extendedValues = new ContentValues(); ContentValues extendedValues = new ContentValues();
extendedValues.put(ExtendedProperties._ID,
subCursor.getString(COLUMN_ID));
extendedValues.put(ExtendedProperties.NAME, extendedValues.put(ExtendedProperties.NAME,
subCursor.getString(COLUMN_NAME)); subCursor.getString(COLUMN_NAME));
extendedValues.put(ExtendedProperties.VALUE, extendedValues.put(ExtendedProperties.VALUE,