summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorMichael Chan <chanm@google.com>2012-07-24 08:53:51 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-07-24 08:53:52 -0700
commita13730f42449d97ec7206769ccaad9d95bc2924f (patch)
treee1f440bbba31be955aadc5791c992c10ce4253c1 /core/java/android
parentbc8bab8949e3ab1ccfff5b5b96ed3726cfa938bb (diff)
parenta07ea5da0751ca297f9176d9deb2e8af9597dfab (diff)
Merge "Fixed the problem where getEntityAndIncrementCursor would always return "0" for attendeeIdentity & attendeeIdNamespace instead of the actual string." into jb-dev
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/provider/CalendarContract.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/provider/CalendarContract.java b/core/java/android/provider/CalendarContract.java
index 1ef0916e0017..a28585cb3aa1 100644
--- a/core/java/android/provider/CalendarContract.java
+++ b/core/java/android/provider/CalendarContract.java
@@ -1442,9 +1442,9 @@ public final class CalendarContract {
attendeeValues.put(Attendees.ATTENDEE_STATUS,
subCursor.getInt(COLUMN_ATTENDEE_STATUS));
attendeeValues.put(Attendees.ATTENDEE_IDENTITY,
- subCursor.getInt(COLUMN_ATTENDEE_IDENTITY));
+ subCursor.getString(COLUMN_ATTENDEE_IDENTITY));
attendeeValues.put(Attendees.ATTENDEE_ID_NAMESPACE,
- subCursor.getInt(COLUMN_ATTENDEE_ID_NAMESPACE));
+ subCursor.getString(COLUMN_ATTENDEE_ID_NAMESPACE));
entity.addSubValue(Attendees.CONTENT_URI, attendeeValues);
}
} finally {