Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 19a04862 authored by Michael Chan's avatar Michael Chan Committed by Android Git Automerger
Browse files

am a13730f4: Merge "Fixed the problem where getEntityAndIncrementCursor would... 

am a13730f4: Merge "Fixed the problem where getEntityAndIncrementCursor would always return "0" for attendeeIdentity & attendeeIdNamespace instead of the actual string." into jb-dev

* commit 'a13730f4':
  Fixed the problem where getEntityAndIncrementCursor would always return "0" for attendeeIdentity & attendeeIdNamespace instead of the actual string.
parents 46653c2f a13730f4

core/java/android/provider/CalendarContract.java

+2 −2
Original line number Diff line number Diff line
@@ -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 {