commit 9ca816649bd2af7d540f375be8fcc503c50aef72
author Marc Blank <mblank@google.com> Thu Apr 29 15:40:30 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Apr 29 15:40:30 2010 -0700
tree 77cd2d6f51e7d272e38bd4e23f615849d08bca57
parent 48399e38c978a66ac4c6054c8681a246dfc94b4b
parent 794cd640bfa8c6d82803b59bc18cbd73627a8162

am 794cd640: Merge "Expose _id in ExtendedProperties subValues" into froyo

Merge commit '794cd640bfa8c6d82803b59bc18cbd73627a8162' into froyo-plus-aosp

* commit '794cd640bfa8c6d82803b59bc18cbd73627a8162':
  Expose _id in ExtendedProperties subValues

core/java/android/provider/Calendar.java

diff --git a/core/java/android/provider/Calendar.java b/core/java/android/provider/Calendar.java
index ba63a66..9a09805 100644
--- a/core/java/android/provider/Calendar.java
+++ b/core/java/android/provider/Calendar.java
@@ -638,11 +638,13 @@
             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 @@
                 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,