commit 3b16892c6bc6b804133163db24ffc5ff54b9a8fb
author Ken Shirriff <kens@google.com> Wed Jan 27 12:27:28 2010 -0800
committer Ken Shirriff <kens@google.com> Wed Jan 27 12:28:33 2010 -0800
tree ccf7155f5fa0e82a4cdc258371e2d033b88d0a91
parent e5651d670103e08c04d19f0aef742900e45d1dba

Fix ExtendedProperties EntityIterator.

The iterator was using the wrong cursor.

bug 2399618

core/java/android/provider/Calendar.java

diff --git a/core/java/android/provider/Calendar.java b/core/java/android/provider/Calendar.java
index cbd8a26..f89ba91 100644
--- a/core/java/android/provider/Calendar.java
+++ b/core/java/android/provider/Calendar.java
@@ -744,9 +744,10 @@
                 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 {