commit 4a220bd6fda5df9be02e2473b49518cb0db9b7c8
author Wenlu Wu <wenlu.xa.wu@sonymobile.com> Wed Jan 20 16:42:20 2016 +0800
committer Toshiya Ikenaga <toshiya.ikenaga@sonymobile.com> Mon Dec 26 17:36:50 2016 +0900
tree 061b58d534f827710d56728ffb349ee5709d2c2f
parent b94019f32f3d82f7027bf91685de1dbe5b8add58

Display incoming call when phone account selection dialog shows

CallCardFragment is not created if there is an incoming call
when phone account selection dialog shows, which results in
incoming call not being shown. Fix issue by dismissing dialog
and showing CallCardFragment in that case.

Bug: 33893516
Change-Id: Icd7a729da974717945275cc5cec93da20864fde3

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();
+        }
     }
 
     /**