Change commit() to commitAllowingStateLoss()
- Following the pattern in Email and Gmail, we change all commit() to commitAllowingStateLoss().
At least this will stop the monkey ISE.
Bug: 5167769
Bug: 5179918
Change-Id: Ibee8380a0f854aeb30bc3c4359fb706faf4efb4b
diff --git a/src/com/android/contacts/CallDetailActivity.java b/src/com/android/contacts/CallDetailActivity.java
index d7881a2..6ab4b68 100644
--- a/src/com/android/contacts/CallDetailActivity.java
+++ b/src/com/android/contacts/CallDetailActivity.java
@@ -220,7 +220,7 @@
playbackFragment.setArguments(fragmentArguments);
voicemailContainer.setVisibility(View.VISIBLE);
getFragmentManager().beginTransaction()
- .add(R.id.voicemail_container, playbackFragment).commit();
+ .add(R.id.voicemail_container, playbackFragment).commitAllowingStateLoss();
mAsyncQueryHandler.startVoicemailStatusQuery(getVoicemailUri());
markVoicemailAsRead(getVoicemailUri());
} else {
diff --git a/src/com/android/contacts/activities/ContactSelectionActivity.java b/src/com/android/contacts/activities/ContactSelectionActivity.java
index 9c6e243..fbb9b66 100644
--- a/src/com/android/contacts/activities/ContactSelectionActivity.java
+++ b/src/com/android/contacts/activities/ContactSelectionActivity.java
@@ -284,7 +284,7 @@
getFragmentManager().beginTransaction()
.replace(R.id.list_container, mListFragment)
- .commit();
+ .commitAllowingStateLoss();
}
public void setupActionListener() {
diff --git a/src/com/android/contacts/activities/DialtactsActivity.java b/src/com/android/contacts/activities/DialtactsActivity.java
index c604e99..23ca0c7 100644
--- a/src/com/android/contacts/activities/DialtactsActivity.java
+++ b/src/com/android/contacts/activities/DialtactsActivity.java
@@ -476,7 +476,7 @@
} else {
transaction.hide(mSearchFragment);
}
- transaction.commit();
+ transaction.commitAllowingStateLoss();
}
}
@@ -793,7 +793,7 @@
// Show the search fragment and hide everything else.
final FragmentTransaction transaction = getFragmentManager().beginTransaction();
transaction.show(mSearchFragment);
- transaction.commit();
+ transaction.commitAllowingStateLoss();
mViewPager.setVisibility(View.GONE);
// We need to call this and onActionViewCollapsed() manually, since we are using a custom
@@ -830,7 +830,7 @@
final FragmentTransaction transaction = getFragmentManager().beginTransaction();
transaction.hide(mSearchFragment);
- transaction.commit();
+ transaction.commitAllowingStateLoss();
// We want to hide SearchView and show Tabs. Also focus on previously selected one.
actionBar.setDisplayShowCustomEnabled(false);
diff --git a/src/com/android/contacts/activities/JoinContactActivity.java b/src/com/android/contacts/activities/JoinContactActivity.java
index 5ee6de2..7f22b18 100644
--- a/src/com/android/contacts/activities/JoinContactActivity.java
+++ b/src/com/android/contacts/activities/JoinContactActivity.java
@@ -95,7 +95,7 @@
getFragmentManager().beginTransaction()
.replace(R.id.list_container, mListFragment)
- .commit();
+ .commitAllowingStateLoss();
}
}
diff --git a/src/com/android/contacts/activities/NonPhoneActivity.java b/src/com/android/contacts/activities/NonPhoneActivity.java
index 26eed7c..922be47 100644
--- a/src/com/android/contacts/activities/NonPhoneActivity.java
+++ b/src/com/android/contacts/activities/NonPhoneActivity.java
@@ -48,7 +48,7 @@
final NonPhoneDialogFragment fragment = new NonPhoneDialogFragment();
fragment.setArguments(Bundle.forPair("PHONE_NUMBER", phoneNumber));
- getFragmentManager().beginTransaction().add(fragment, "Fragment").commit();
+ getFragmentManager().beginTransaction().add(fragment, "Fragment").commitAllowingStateLoss();
}
private String getPhoneNumber() {
diff --git a/src/com/android/contacts/activities/PeopleActivity.java b/src/com/android/contacts/activities/PeopleActivity.java
index a03f83f..2815256 100644
--- a/src/com/android/contacts/activities/PeopleActivity.java
+++ b/src/com/android/contacts/activities/PeopleActivity.java
@@ -388,7 +388,7 @@
getFragmentManager(), findViewById(R.id.contact_detail_container),
new ContactDetailFragmentListener());
}
- transaction.commit();
+ transaction.commitAllowingStateLoss();
fragmentManager.executePendingTransactions();
// Setting Properties after fragment is created
@@ -665,7 +665,7 @@
break;
}
if (!ft.isEmpty()) {
- ft.commit();
+ ft.commitAllowingStateLoss();
fragmentManager.executePendingTransactions();
// When switching tabs, we need to invalidate options menu, but executing a
// fragment transaction does it implicitly. We don't have to call invalidateOptionsMenu
@@ -816,7 +816,7 @@
@Override
public void finishUpdate(View container) {
if (mCurTransaction != null) {
- mCurTransaction.commit();
+ mCurTransaction.commitAllowingStateLoss();
mCurTransaction = null;
mFragmentManager.executePendingTransactions();
}
@@ -926,7 +926,7 @@
new ContactsUnavailableFragmentListener());
getFragmentManager().beginTransaction()
.replace(R.id.contacts_unavailable_container, mContactsUnavailableFragment)
- .commit();
+ .commitAllowingStateLoss();
} else {
mContactsUnavailableFragment.update();
}
diff --git a/src/com/android/contacts/detail/ContactDetailLayoutController.java b/src/com/android/contacts/detail/ContactDetailLayoutController.java
index f9d6443..b26f8eb 100644
--- a/src/com/android/contacts/detail/ContactDetailLayoutController.java
+++ b/src/com/android/contacts/detail/ContactDetailLayoutController.java
@@ -168,7 +168,7 @@
ContactDetailViewPagerAdapter.ABOUT_FRAGMENT_TAG);
transaction.add(R.id.updates_fragment_container, mUpdatesFragment,
ContactDetailViewPagerAdapter.UPDTES_FRAGMENT_TAG);
- transaction.commit();
+ transaction.commitAllowingStateLoss();
mFragmentManager.executePendingTransactions();
}
@@ -187,7 +187,7 @@
ContactDetailViewPagerAdapter.ABOUT_FRAGMENT_TAG);
transaction.add(R.id.updates_fragment_container, mUpdatesFragment,
ContactDetailViewPagerAdapter.UPDTES_FRAGMENT_TAG);
- transaction.commit();
+ transaction.commitAllowingStateLoss();
mFragmentManager.executePendingTransactions();
}
break;
@@ -202,7 +202,7 @@
ContactDetailViewPagerAdapter.ABOUT_FRAGMENT_TAG);
transaction.add(R.id.updates_fragment_container, mUpdatesFragment,
ContactDetailViewPagerAdapter.UPDTES_FRAGMENT_TAG);
- transaction.commit();
+ transaction.commitAllowingStateLoss();
mFragmentManager.executePendingTransactions();
}
diff --git a/src/com/android/contacts/interactions/ContactDeletionInteraction.java b/src/com/android/contacts/interactions/ContactDeletionInteraction.java
index 93bd10e..86f4eda 100644
--- a/src/com/android/contacts/interactions/ContactDeletionInteraction.java
+++ b/src/com/android/contacts/interactions/ContactDeletionInteraction.java
@@ -123,7 +123,8 @@
fragment.setTestLoaderManager(testLoaderManager);
fragment.setContactUri(contactUri);
fragment.setFinishActivityWhenDone(finishActivityWhenDone);
- fragmentManager.beginTransaction().add(fragment, FRAGMENT_TAG).commit();
+ fragmentManager.beginTransaction().add(fragment, FRAGMENT_TAG)
+ .commitAllowingStateLoss();
} else {
fragment.setTestLoaderManager(testLoaderManager);
fragment.setContactUri(contactUri);