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

Commit 5f5ef752 authored by Michael Chan's avatar Michael Chan
Browse files

Fix NPE in EventInfoFragment 

updateEvent is called from mTZUpdater

Bug: 6556101
Change-Id: I8c7b3258317b09d878bd564d2df71842ee3c7ae7
parent 23d1fef1

src/com/android/calendar/EventInfoFragment.java

+6 −1
Original line number Diff line number Diff line
@@ -1125,6 +1125,11 @@ public class EventInfoFragment extends DialogFragment implements OnCheckedChange 
            return;

        }



        Context context = view.getContext();

        if (context == null) {

            return;

        }



        String eventName = mEventCursor.getString(EVENT_INDEX_TITLE);

        if (eventName == null || eventName.length() == 0) {

            eventName = getActivity().getString(R.string.no_title_label);
@@ -1147,7 +1152,7 @@ public class EventInfoFragment extends DialogFragment implements OnCheckedChange 
        // When

        // Set the date and repeats (if any)

        String localTimezone = Utils.getTimeZone(mActivity, mTZUpdater);

        Activity context = getActivity();



        Resources resources = context.getResources();

        String displayedDatetime = Utils.getDisplayedDatetime(mStartMillis, mEndMillis,

                System.currentTimeMillis(), localTimezone, mAllDay, context);