commit d9eafd484eac695fa65849120b228ad4dc60d271
author Linux Build Service Account <lnxbuild@localhost> Tue Sep 06 07:44:55 2016 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Sep 06 07:44:55 2016 -0700
tree 2453b754596aa175fb9fcedb3fe6b7d41677045f
parent edefa46c8f069e16651b9a14ead39d324f45a441
parent 11cd7b71b7f7d2cdac3946d6bb734975e166922d

Merge "MSIM: Dismiss pending dialog on incoming call notification." into atel.lnx.2.0-dev

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 edd6b0a..5db5eeb 100644
--- a/InCallUI/src/com/android/incallui/InCallActivity.java
+++ b/InCallUI/src/com/android/incallui/InCallActivity.java
@@ -924,6 +924,11 @@
             mDialog.dismiss();
             mDialog = null;
         }
+        SelectPhoneAccountDialogFragment dialogFragment = (SelectPhoneAccountDialogFragment)
+                getFragmentManager().findFragmentByTag(TAG_SELECT_ACCT_FRAGMENT);
+        if (dialogFragment != null) {
+            dialogFragment.dismiss();
+        }
         if (mAnswerFragment != null) {
             mAnswerFragment.dismissPendingDialogs();
         }

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

diff --git a/InCallUI/src/com/android/incallui/InCallPresenter.java b/InCallUI/src/com/android/incallui/InCallPresenter.java
index 7df32ae..68a03b9 100644
--- a/InCallUI/src/com/android/incallui/InCallPresenter.java
+++ b/InCallUI/src/com/android/incallui/InCallPresenter.java
@@ -1492,6 +1492,7 @@
             // We're about the bring up the in-call UI for an incoming call. If we still have
             // dialogs up, we need to clear them out before showing incoming screen.
             if (isActivityStarted()) {
+                mInCallActivity.showCallCardFragment(true);
                 mInCallActivity.dismissPendingDialogs();
             }
             if (!startUi(newState)) {