summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorKen Shirriff <kens@google.com>2010-01-27 13:08:01 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-01-27 13:08:01 -0800
commit6c1ddedfeebbb3f0b500bfa947108eb9630cacb6 (patch)
treecb8bc180c7a4c0903bae47dd0d52fec450454ef4 /core/java/android
parenta3b95a995fced569c24b6d15af654bc9b4e57cb3 (diff)
parent3b16892c6bc6b804133163db24ffc5ff54b9a8fb (diff)
Merge "Fix ExtendedProperties EntityIterator."
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/provider/Calendar.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/core/java/android/provider/Calendar.java b/core/java/android/provider/Calendar.java
index cbd8a264c6c0..f89ba9195ead 100644
--- a/core/java/android/provider/Calendar.java
+++ b/core/java/android/provider/Calendar.java
@@ -744,9 +744,10 @@ public final class Calendar {
try {
while (subCursor.moveToNext()) {
ContentValues extendedValues = new ContentValues();
- extendedValues.put(ExtendedProperties.NAME, cursor.getString(COLUMN_NAME));
+ extendedValues.put(ExtendedProperties.NAME,
+ subCursor.getString(COLUMN_NAME));
extendedValues.put(ExtendedProperties.VALUE,
- cursor.getString(COLUMN_VALUE));
+ subCursor.getString(COLUMN_VALUE));
entity.addSubValue(ExtendedProperties.CONTENT_URI, extendedValues);
}
} finally {