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

Commit e846f65f authored by Steve Kondik's avatar Steve Kondik Committed by Gerrit Code Review
Browse files

Merge "prevent NPE in getNextCalendarAlarm (again)" into gingerbread

parents f610ddb7 020fd6ea

core/java/com/android/internal/widget/LockPatternUtils.java

+11 −10
Original line number Diff line number Diff line
@@ -752,6 +752,8 @@ public class LockPatternUtils { 
                    where.toString(),

                    Calendar.EventsColumns.DTSTART + " ASC");



            if (cursor != null && cursor.moveToFirst()) {



                // All day events are given in UTC. This can cause them to be sorted

                // as earlier events compared to a normal event on the night before

                // we can fix this by doing UTC time - offset => local time and then
@@ -762,7 +764,6 @@ public class LockPatternUtils { 
                boolean allDay, isRepeat;

                int i = cursor.getCount() - 1;



            if (cursor != null && cursor.moveToFirst()) {

                do {

                    title       = cursor.getString(0);

                    start       = new Date(cursor.getLong(1));