From 3b16892c6bc6b804133163db24ffc5ff54b9a8fb Mon Sep 17 00:00:00 2001
From: Ken Shirriff <kens@google.com>
Date: Wed, 27 Jan 2010 12:27:28 -0800
Subject: [PATCH] Fix ExtendedProperties EntityIterator.

The iterator was using the wrong cursor.

bug 2399618
---
 core/java/android/provider/Calendar.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/java/android/provider/Calendar.java b/core/java/android/provider/Calendar.java
index cbd8a264c6c0a..f89ba9195ead6 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 {