InCallUi: Mitigate redial/recent call double tap state loss.

  In some instances, double tapping the redial/recent
  button forces the device into a state where a call
  can never be made again. Mitigate this by forcing
  InCallActivity to be reset as well as clearing account
  selection on tear down.

Change-Id: Ibc07175ed802bc29bcbe584d5b7fc7a7f3a0cf8a

1 files changed, 5 insertions, 1 deletions

diff --git a/src/com/android/incallui/InCallPresenter.java b/src/com/android/incallui/InCallPresenter.java
index 2ffba4fa..7ca624a9 100644
--- a/src/com/android/incallui/InCallPresenter.java
+++ b/src/com/android/incallui/InCallPresenter.java
@@ -393,6 +393,9 @@ public class InCallPresenter implements CallList.Listener,
             updateListeners = true;
             mInCallActivity = null;
 
+            // Cancel any pending dialogs
+            cancelAccountSelection();
+
             // We attempt cleanup for the destroy case but only after we recalculate the state
             // to see if we need to come back up or stay shut down. This is why we do the
             // cleanup after the call to onCallListChange() instead of directly here.
@@ -1357,9 +1360,10 @@ public class InCallPresenter implements CallList.Listener,
             boolean showCircularReveal, boolean newTask) {
         final Intent intent = new Intent(Intent.ACTION_MAIN, null);
         intent.setFlags(Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS
-                | Intent.FLAG_ACTIVITY_NO_USER_ACTION);
+                | Intent.FLAG_ACTIVITY_NO_USER_ACTION | Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
         if (newTask) {
             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
         }
 
         intent.setClass(mContext, InCallActivity.class);