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

Commit 988beaa3 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Cannot open date before 1970/01/01 from quickcontact screen" am:... 

Merge "Cannot open date before 1970/01/01 from quickcontact screen" am: 548f5ceb am: b1c3011f am: c6696fe1

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Contacts/+/1337196



Change-Id: I6a3b5c5eb21b29989204470f4b9ac9bab30aac23
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 12e2eb10 c6696fe1

src/com/android/contacts/quickcontact/QuickContactActivity.java

+5 −0
Original line number Diff line number Diff line
@@ -1484,6 +1484,11 @@ public class QuickContactActivity extends ContactsActivity { 
            final String dataString = event.buildDataStringForDisplay(context, kind);

            final Calendar cal = DateUtils.parseDate(dataString, false);

            if (cal != null) {

                final int eventType = event.getContentValues().getAsInteger(Event.TYPE);

                if (eventType == Event.TYPE_ANNIVERSARY || eventType == Event.TYPE_BIRTHDAY) {

                    // setting the year to 0 makes a click open the coming birthday

                    cal.set(Calendar.YEAR, 0);

                }

                final Date nextAnniversary =

                        DateUtils.getNextAnnualDate(cal);

                final Uri.Builder builder = CalendarContract.CONTENT_URI.buildUpon();