commit 773dcaa217e32036fdc0aa156c3b4ae93034df15
author Linux Build Service Account <lnxbuild@localhost> Wed Nov 02 00:29:22 2016 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Nov 02 00:29:22 2016 -0700
tree 894eb142cbd48dc59d5a0d44848aa9757d81dea8
parent ad5bee35eb5ea197d0a21de3e488d4156f4af758
parent 4fced67276ed394ede861e42d3c8b5844e166530

Merge "dismiss obsolete dialogues" into atel.lnx.2.0-dev

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 d1a19e6..9d2820d 100644
--- a/InCallUI/src/com/android/incallui/InCallPresenter.java
+++ b/InCallUI/src/com/android/incallui/InCallPresenter.java
@@ -330,6 +330,11 @@
         mProximitySensor = proximitySensor;
         addListener(mProximitySensor);
 
+        // dismiss any pending dialogues related to earlier call, which
+        // are no longer relevant now.
+        if (isActivityStarted()) {
+            mInCallActivity.dismissPendingDialogs();
+        }
         addIncomingCallListener(mAnswerPresenter);
         addInCallUiListener(mAnswerPresenter);
         mPowerManager = (PowerManager) mContext.getSystemService(Context.POWER_SERVICE);