Always write current state in EditorFragment
When the choose default account activity dialog is shown,
mState in EditorFragment is empty, so it doesn't get written to the
out bundle. When we come back to the fragment save state exists
and null is read.
Test:
Followed repro steps in bug. Only repro'd when don't keep activities
was enabled.
Bug: 32118572
Change-Id: I80e972cf18ac1b460a849a8e5a2cc8853bac62c4
diff --git a/src/com/android/contacts/editor/ContactEditorFragment.java b/src/com/android/contacts/editor/ContactEditorFragment.java
index 5f83be7..e013da4 100644
--- a/src/com/android/contacts/editor/ContactEditorFragment.java
+++ b/src/com/android/contacts/editor/ContactEditorFragment.java
@@ -615,10 +615,7 @@
Lists.<RawContact>newArrayList() : Lists.newArrayList(mRawContacts));
// NOTE: mGroupMetaData is not saved
- if (hasValidState()) {
- // Store entities with modifications
- outState.putParcelable(KEY_EDIT_STATE, mState);
- }
+ outState.putParcelable(KEY_EDIT_STATE, mState);
outState.putInt(KEY_STATUS, mStatus);
outState.putBoolean(KEY_HAS_NEW_CONTACT, mHasNewContact);
outState.putBoolean(KEY_NEW_CONTACT_READY, mNewContactDataReady);