commit 8012f1a83f45913f13209e6074300df2bbadd75b
author Wenlu Wu <wenlu.xa.wu@sonymobile.com> Fri Jan 06 03:28:03 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jan 06 03:28:03 2017 +0000
tree 6125f03544d59ab4d27d64544b3d2d5803386948
parent 3a4da507fdbbc25741c43d40f452592d8174f2c7
parent f6a3e266444e7e440232e68662c2d1086893eaef

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

Change-Id: I4e06aae3310b7f29d120daa3222f0d07c73b50b3

InCallUI/src/com/android/incallui/InCallActivity.java

diff --git a/InCallUI/src/com/android/incallui/InCallActivity.java b/InCallUI/src/com/android/incallui/InCallActivity.java
index eca79f8..abbdf46 100644
--- a/InCallUI/src/com/android/incallui/InCallActivity.java
+++ b/InCallUI/src/com/android/incallui/InCallActivity.java
@@ -844,6 +844,12 @@
     }
 
     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);
     }
 
@@ -888,6 +894,12 @@
         if (mAnswerFragment != null) {
             mAnswerFragment.dismissPendingDialogs();
         }
+
+        SelectPhoneAccountDialogFragment dialogFragment = (SelectPhoneAccountDialogFragment)
+                getFragmentManager().findFragmentByTag(TAG_SELECT_ACCT_FRAGMENT);
+        if (dialogFragment != null) {
+            dialogFragment.dismiss();
+        }
     }
 
     /**