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

Commit 252159e0 authored by Katherine Kuan's avatar Katherine Kuan Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE in PeopleActivity with returning a null intent from editor" into ics-mr1

parents b2bc716b e21b1670

src/com/android/contacts/activities/ContactEditorActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ public class ContactEditorActivity extends ContactsActivity 
        @Override

        public void onSaveFinished(Intent resultIntent) {

            if (mFinishActivityOnSaveCompleted) {

                setResult(RESULT_OK, resultIntent);

                setResult(resultIntent == null ? RESULT_CANCELED : RESULT_OK, resultIntent);

            } else if (resultIntent != null) {

                startActivity(resultIntent);

            }