am 08f73298: Merge "Don\'t do fragment transactions if fragment is destroyed" into klp-dev

* commit '08f732988fa1681def754f2e56053599eca77ffd':
  Don't do fragment transactions if fragment is destroyed

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);