Merge "Display incoming call when phone account selection dialog shows" am: fdf68fbd0b am: 2f06e83ade am: f6a3e26644

am: 8012f1a83f

Change-Id: Ife7419f7c86aafe4a2a6a3656e257383b1f0c079

1 files changed, 12 insertions, 0 deletions

diff --git a/InCallUI/src/com/android/incallui/InCallActivity.java b/InCallUI/src/com/android/incallui/InCallActivity.java
index 5ae231ae1..eaaedff2c 100644
--- a/InCallUI/src/com/android/incallui/InCallActivity.java
+++ b/InCallUI/src/com/android/incallui/InCallActivity.java
@@ -848,6 +848,12 @@ public class InCallActivity extends TransactionSafeActivity implements FragmentD
     }
 
     public void showAnswerFragment(boolean show) {
+        // CallCardFragment is the parent fragment of AnswerFragment.
+        // Must create the CallCardFragment first before creating
+        // AnswerFragment if CallCardFragment is null.
+        if (show && getCallCardFragment() == null) {
+            showCallCardFragment(true);
+        }
         showFragment(TAG_ANSWER_FRAGMENT, show, true);
     }
 
@@ -892,6 +898,12 @@ public class InCallActivity extends TransactionSafeActivity implements FragmentD
         if (mAnswerFragment != null) {
             mAnswerFragment.dismissPendingDialogs();
         }
+
+        SelectPhoneAccountDialogFragment dialogFragment = (SelectPhoneAccountDialogFragment)
+                getFragmentManager().findFragmentByTag(TAG_SELECT_ACCT_FRAGMENT);
+        if (dialogFragment != null) {
+            dialogFragment.dismiss();
+        }
     }
 
     /**