summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2013-09-27 00:36:11 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-09-27 00:36:12 +0000
commit08f732988fa1681def754f2e56053599eca77ffd (patch)
tree4575da186f29fd3d257cd73d51795e54f9e0b52c /src
parente2be8b42b1c2da7129f42cc59c5d43470c0a2b7b (diff)
parent3487db78fd47ccecef4e6b86e5cacfc0a8e6ba83 (diff)
downloadandroid_packages_apps_Dialer-08f732988fa1681def754f2e56053599eca77ffd.tar.gz
android_packages_apps_Dialer-08f732988fa1681def754f2e56053599eca77ffd.tar.bz2
android_packages_apps_Dialer-08f732988fa1681def754f2e56053599eca77ffd.zip
Merge "Don't do fragment transactions if fragment is destroyed" into klp-dev
Diffstat (limited to 'src')
-rw-r--r--src/com/android/dialer/DialtactsActivity.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java
index 3e6591658..1a1713316 100644
--- a/src/com/android/dialer/DialtactsActivity.java
+++ b/src/com/android/dialer/DialtactsActivity.java
@@ -858,6 +858,10 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O
* Hides the search fragment
*/
private void exitSearchUi() {
+ // See related bug in enterSearchUI();
+ if (getFragmentManager().isDestroyed()) {
+ return;
+ }
// Go all the way back to the favorites fragment, regardless of how many times we
// transitioned between search fragments
final BackStackEntry entry = getFragmentManager().getBackStackEntryAt(0);